diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-06-24 03:17:57 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-06-24 03:17:57 +0000 |
| commit | 50214b7a663fb17f94f02549af3f6d8a29cfbd43 (patch) | |
| tree | ae93e4e7fbb097ef273322fd977bcb437b4db513 | |
| parent | b65bb93e6711a3543228928e6793c49481df54d6 (diff) | |
| download | tigervnc-50214b7a663fb17f94f02549af3f6d8a29cfbd43.tar.gz tigervnc-50214b7a663fb17f94f02549af3f6d8a29cfbd43.zip | |
Ensure that FLTK is built with the static run-time library if using Visual C++
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4528 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | fltk/extensions.patch | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/fltk/extensions.patch b/fltk/extensions.patch index 1ee7036c..edce5f9f 100644 --- a/fltk/extensions.patch +++ b/fltk/extensions.patch @@ -1,5 +1,5 @@ *** fltk-1.3.0/CMakeLists.txt 2011-01-06 04:24:58.000000000 -0600 ---- fltk-1.3.0-new/CMakeLists.txt 2011-06-23 17:21:42.000000000 -0500 +--- fltk-1.3.0-new/CMakeLists.txt 2011-06-23 21:39:42.000000000 -0500 *************** *** 49,52 **** --- 49,56 ---- @@ -19,6 +19,23 @@ + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Carbon") endif(APPLE) +*************** +*** 68,71 **** +--- 73,86 ---- + add_definitions(-DWIN32_LEAN_AND_MEAN) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ ++ # Use the static C library for all build types ++ foreach(var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE ++ CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO ++ CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE ++ CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) ++ if(${var} MATCHES "/MD") ++ string(REGEX REPLACE "/MD" "/MT" ${var} "${${var}}") ++ endif() ++ endforeach() + endif(MSVC) + if(CMAKE_C_COMPILER_ID STREQUAL GNU) *** fltk-1.3.0/FL/Enumerations.H 2011-05-21 16:55:59.000000000 -0500 --- fltk-1.3.0-new/FL/Enumerations.H 2011-06-22 22:35:32.000000000 -0500 *************** |