cvs: gd /libgd/src CMakeLists.txt
[email protected] ("Pierre-Alain Joye") Fri, 09 May 2008 08:13:09 -0000
| Newsgroups | php.gd.cvs |
|---|---|
| Message-ID | <cvspajoye1210320789@cvsserver> |
pajoye Fri May 9 08:13:09 2008 UTC
Modified files:
/gd/libgd/src CMakeLists.txt
Log:
- add ms-bit-fields option for mingw and msys
http://cvs.php.net/viewvc.cgi/gd/libgd/src/CMakeLists.txt?r1=1.16&r2=1.17&diff_format=u
Index: gd/libgd/src/CMakeLists.txt
diff -u gd/libgd/src/CMakeLists.txt:1.16 gd/libgd/src/CMakeLists.txt:1.17
--- gd/libgd/src/CMakeLists.txt:1.16 Fri Apr 18 14:33:07 2008
+++ gd/libgd/src/CMakeLists.txt Fri May 9 08:13:08 2008
@@ -58,9 +58,13 @@
add_library(${GD_LIB_STATIC} STATIC ${LIBGD_SRC_FILES})
if (WIN32 AND NOT MINGW AND NOT MSYS)
- SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib")
+# SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib")
ENDIF(WIN32 AND NOT MINGW AND NOT MSYS)
+if (MINGW OR MSYS)
+ ADD_DEFINITIONS("-mms-bitfields")
+endif (MINGW OR MSYS)
+
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/ ${GD_SOURCE_DIR}/src)
target_link_libraries(${GD_LIB} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})