Mercurial > mxe-octave
annotate src/qjson-1-static.patch @ 5893:53a6c7df43f8
Mesa 3D: Update to version 21.1.8.
* src/mesa.mk: Update version and checksum.
* src/mesa-2-uninitialized.patch: Remove file.
* dist-files.mk: Remove file from list.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Thu, 16 Sep 2021 22:37:45 +0200 |
| parents | 99516e73b368 |
| children |
| rev | line source |
|---|---|
|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
1934
diff
changeset
|
1 This file is part of MXE. |
|
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
| 1934 | 3 |
| 4 This patch taken from: | |
| 5 http://sourceforge.net/mailarchive/forum.php?thread_name=4E1DBC0D.10000%40jrit.at&forum_name=qjson-devel | |
| 6 | |
| 7 diff --git a/CMakeLists.txt b/CMakeLists.txt | |
| 8 index 4ed5478..9a378a1 100644 | |
| 9 --- a/CMakeLists.txt | |
| 10 +++ b/CMakeLists.txt | |
| 11 @@ -30,6 +30,13 @@ IF(QJSON_VERBOSE_DEBUG_OUTPUT) | |
| 12 ADD_DEFINITIONS("-DQJSON_VERBOSE_DEBUG_OUTPUT") | |
| 13 endif(QJSON_VERBOSE_DEBUG_OUTPUT) | |
| 14 | |
| 15 +# For Static builds | |
| 16 +IF(LIBTYPE STREQUAL "STATIC") | |
| 17 + ADD_DEFINITIONS("-DQJSON_STATIC") | |
| 18 + ADD_DEFINITIONS("-DQT_NODLL") | |
| 19 + SET(PKG_CONFIG_CFLAGS -DQJSON_STATIC ${PKG_CONFIG_CFLAGS}) | |
| 20 +endif() | |
| 21 + | |
| 22 # Find Qt4 | |
| 23 FIND_PACKAGE( Qt4 REQUIRED ) | |
| 24 | |
| 25 @@ -51,13 +58,13 @@ set(QJSON_LIB_VERSION_STRING "${QJSON_LIB_MAJOR_VERSION}.${QJSON_LIB_MINOR_VERSI | |
| 26 set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" ) | |
| 27 | |
| 28 # pkg-config | |
| 29 -IF (NOT WIN32) | |
| 30 +if (NOT WIN32 OR MINGW) | |
| 31 CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/QJson.pc.in | |
| 32 ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc | |
| 33 @ONLY) | |
| 34 INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc | |
| 35 DESTINATION lib${LIB_SUFFIX}/pkgconfig) | |
| 36 -ENDIF (NOT WIN32) | |
| 37 +endif() | |
| 38 | |
| 39 # Include the cmake file needed to use qt4 | |
| 40 INCLUDE( ${QT_USE_FILE} ) | |
| 41 diff --git a/QJson.pc.in b/QJson.pc.in | |
| 42 index e4704bd..bf5fd01 100644 | |
| 43 --- a/QJson.pc.in | |
| 44 +++ b/QJson.pc.in | |
| 45 @@ -8,4 +8,4 @@ Description: QJson is a qt-based library that maps JSON data to QVariant objects | |
| 46 Version: @QJSON_LIB_MAJOR_VERSION@.@QJSON_LIB_MINOR_VERSION@.@QJSON_LIB_PATCH_VERSION@ | |
| 47 Requires: QtCore | |
| 48 Libs: -L${libdir} -lqjson | |
| 49 -Cflags: -I${includedir} | |
| 50 \ No newline at end of file | |
| 51 +Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@ | |
| 52 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | |
| 53 index ced213d..d0d9c68 100644 | |
| 54 --- a/src/CMakeLists.txt | |
| 55 +++ b/src/CMakeLists.txt | |
| 56 @@ -26,7 +26,12 @@ qt4_wrap_cpp(qjson_MOC_SRCS ${qjson_MOC_HDRS}) | |
| 57 | |
| 58 set (qjson_SRCS parser.cpp qobjecthelper.cpp json_scanner.cpp json_parser.cc parserrunnable.cpp serializer.cpp serializerrunnable.cpp) | |
| 59 | |
| 60 -add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS}) | |
| 61 +IF(LIBTYPE STREQUAL "STATIC") | |
| 62 + add_library (qjson STATIC ${qjson_SRCS} ${qjson_MOC_SRCS}) | |
| 63 +else() | |
| 64 + add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS}) | |
| 65 +endif() | |
| 66 + | |
| 67 target_link_libraries( qjson ${QT_LIBRARIES}) | |
| 68 | |
| 69 set_target_properties(qjson PROPERTIES | |
| 70 diff --git a/src/qjson_export.h b/src/qjson_export.h | |
| 71 index c7f5325..d5871e2 100644 | |
| 72 --- a/src/qjson_export.h | |
| 73 +++ b/src/qjson_export.h | |
| 74 @@ -23,7 +23,9 @@ | |
| 75 #include <QtCore/qglobal.h> | |
| 76 | |
| 77 #ifndef QJSON_EXPORT | |
| 78 -# if defined(QJSON_MAKEDLL) | |
| 79 +# ifdef QJSON_STATIC | |
| 80 +# define QJSON_EXPORT | |
| 81 +# elif defined(QJSON_MAKEDLL) | |
| 82 /* We are building this library */ | |
| 83 # define QJSON_EXPORT Q_DECL_EXPORT | |
| 84 # else |