• R/O
  • SSH

libqttools: Commit

This library contains code that extends and simplifies different operations
for C++ language based programs which use Qt5 framework as well


Commit MetaInfo

Revisión98bedb2ea9c9247965d96ec046f6f43a1a211117 (tree)
Tiempo2017-12-11 08:01:44
AutorSergey Gusarov
CommiterSergey Gusarov

Log Message

mingw: Fixed dynamic linking

Cambiar Resumen

Diferencia incremental

diff -r dd35258d7719 -r 98bedb2ea9c9 .hgsubstate
--- a/.hgsubstate Sun Oct 29 19:57:16 2017 +0300
+++ b/.hgsubstate Mon Dec 11 02:01:44 2017 +0300
@@ -1,2 +1,2 @@
1-61d4749bd5364de2d2b79f6d1f5014e25ee18b6d libcpptools
1+5d2fcafc2500468364b556d282e3b9c332665490 libcpptools
22 d6a263a39f345f7ebb8d0865b452104bfad4b198 pyrepo
diff -r dd35258d7719 -r 98bedb2ea9c9 CMakeLists.txt
--- a/CMakeLists.txt Sun Oct 29 19:57:16 2017 +0300
+++ b/CMakeLists.txt Mon Dec 11 02:01:44 2017 +0300
@@ -33,8 +33,6 @@
3333 elseif ("${QTT_MODULE}" MATCHES "DYNAMIC")
3434 set(QTT_LINK "SHARED")
3535 add_definitions(-DQTT_SHARED_DYNAMIC)
36- add_definitions(-DCT_USE_SHARED_DYNAMIC)
37- add_definitions(-DCPT_USE_SHARED_DYNAMIC)
3836 endif()
3937 set(CPT_MODULE "${QTT_MODULE}")
4038
@@ -162,6 +160,8 @@
162160 include(${CMAKE_CURRENT_SOURCE_DIR}/libcpptools/libctools/cmake/cmake_tools/tools/link_public.cmake)
163161 target_link_libraries(${PROJECT_NAME} ${CMT_LINK_PUBLIC} ${OPENGL_LIBRARIES} ${OpenCV_LIBS} ${QT_LIBS} ${DEPENDENCY_LIBRARY_CPPTOOLS})
164162
163+target_compile_definitions(${PROJECT_NAME} ${CMT_LINK_PUBLIC} CT_USE_SHARED_DYNAMIC CPT_USE_SHARED_DYNAMIC)
164+
165165 set(CMAKE_VERBOSE_MAKEFILE true)
166166
167167 if (QTT_BUILD_TESTS)
diff -r dd35258d7719 -r 98bedb2ea9c9 include/qttools/coding.hpp
--- a/include/qttools/coding.hpp Sun Oct 29 19:57:16 2017 +0300
+++ b/include/qttools/coding.hpp Mon Dec 11 02:01:44 2017 +0300
@@ -52,7 +52,7 @@
5252 #define QTT_UTF8_PRINTABLE(str) ((str).toUtf8().constData())
5353
5454 #if defined (CT_OS_WINDOWS)
55-QTT_SHARED_API const QTextCodec* kSystemCpCodec;
55+QTT_SHARED_API extern const QTextCodec* kSystemCpCodec;
5656
5757 # define QTT_IO_PRINTABLE(str) (qttools::kSystemCpCodec->fromUnicode(str).constData())
5858 #else
Show on old repository browser