SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@489 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Бычков Андрей
2019-02-15 14:45:32 +00:00
parent 93361f51ad
commit 46a9c1b510
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cd_utils/cdutils_core.cpp
View File

@@ -59,6 +59,9 @@ __Core_Initializer__::~__Core_Initializer__() {
CDCore::CDCore() { CDCore::CDCore() {
setName("CDCore"); setName("CDCore");
sendt.setName("CDCore_send_thread");
datatr.setName("CDCore_datatransfer");
x_timer.setName("CDCore_X_timer");
datatr.setPacketSize(960); datatr.setPacketSize(960);
CONNECTU(&connection, dataReceivedEvent, this, dataReceived); CONNECTU(&connection, dataReceivedEvent, this, dataReceived);
CONNECTU(PICout::Notifier::object(), finished, this, piCoutFinished); CONNECTU(PICout::Notifier::object(), finished, this, piCoutFinished);
@@ -93,11 +96,16 @@ CDCore::CDCore() {
CDCore::~CDCore() { CDCore::~CDCore() {
piCout << "~CDCore";
datatr.stop(); datatr.stop();
piCout << "~datatr.stop()";
x_timer.stop(); x_timer.stop();
sendt.stop(); piCout << "~x_timer.stop()";
sendt.waitForFinish(10); sendt.stop(true);
piCout << "~sendt.stop()";
// sendt.waitForFinish(10);
connection.stop(); connection.stop();
piCout << "~connection.stop()";
} }

2
make_libs.bat
View File

@@ -3,4 +3,4 @@ set ARCH=%~1
set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin
if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH% if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH%
mkdir ..\libs_build_win%ARCH% mkdir ..\libs_build_win%ARCH%
cd ../libs_build_win%ARCH% && cmake_mgw -Wno-dev -DQGLVIEW=1 ../libs && make install -j4 && cd ../libs && pause cd ../libs_build_win%ARCH% && cmake_mgw -Wno-dev -DQGLVIEW=1 ../libs && make install -j16 && cd ../libs && pause

2
make_libs_all.bat
View File

@@ -1,2 +1,2 @@
start cmd /C make_libs32.bat :start cmd /C make_libs32.bat
start cmd /C make_libs64.bat start cmd /C make_libs64.bat