|
|
@@ -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 |
|
|
|
*************** |