ENH: fix for mingw

This commit is contained in:
Bill Hoffman 2004-04-21 15:09:07 -04:00
parent b55d109864
commit 8414c65862
1 changed files with 414 additions and 405 deletions

View File

@ -66,9 +66,19 @@
## -testing of DLL linking under MS WIN32 ## -testing of DLL linking under MS WIN32
## ##
IF(WIN32) IF(WIN32)
SET(WIN32_STYLE_FIND 1)
ENDIF(MINGW)
IF(MINGW)
SET(WIN32_STYLE_FIND 0)
SET(UNIX_STYLE_FIND 1)
ENDIF(MINGW)
IF(UNIX)
SET(UNIX_STYLE_FIND 1)
ENDIF(MINGW)
IF(WIN32_STYLE_FIND)
## ###################################################################### ## ######################################################################
## ##
@ -128,13 +138,13 @@ IF(WIN32)
comctl32 comctl32
rpcrt4 rpcrt4
wsock32 wsock32
## presumably ctl3d32 is not neccesary (Jan Woetzel 07/2003) ## presumably ctl3d32 is not neccesary (Jan Woetzel 07/2003)
# ctl3d32 # ctl3d32
# debug ${WXWINDOWS_ROOT_DIR}/lib/zlibd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/zlibd.lib # debug ${WXWINDOWS_ROOT_DIR}/lib/zlibd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/zlibd.lib
# debug ${WXWINDOWS_ROOT_DIR}/lib/regexd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/regexd.lib # debug ${WXWINDOWS_ROOT_DIR}/lib/regexd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/regexd.lib
# debug ${WXWINDOWS_ROOT_DIR}/lib/pngd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/pngd.lib # debug ${WXWINDOWS_ROOT_DIR}/lib/pngd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/pngd.lib
# debug ${WXWINDOWS_ROOT_DIR}/lib/jpegd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/jpegd.lib # debug ${WXWINDOWS_ROOT_DIR}/lib/jpegd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/jpegd.lib
# debug ${WXWINDOWS_ROOT_DIR}/lib/tiffd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/tiff.lib # debug ${WXWINDOWS_ROOT_DIR}/lib/tiffd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/tiff.lib
) )
# JW removed option and force the develper th SET it. # JW removed option and force the develper th SET it.
@ -289,9 +299,8 @@ IF(WIN32)
) )
ELSE(WIN32) ELSE(WIN32_STYLE_FIND)
IF (UNIX) IF (UNIX_STYLE_FIND)
## ###################################################################### ## ######################################################################
## ##
## UNIX/Linux specific: ## UNIX/Linux specific:
@ -383,10 +392,10 @@ IF (UNIX)
ELSE(UNIX) ELSE(UNIX_STYLE_FIND)
MESSAGE(SEND_ERROR "FindwxWindows.cmake: Platform unknown/unsupported by FindwxWindows.cmake. It's neither WIN32 nor UNIX") MESSAGE(SEND_ERROR "FindwxWindows.cmake: Platform unknown/unsupported by FindwxWindows.cmake. It's neither WIN32 nor UNIX")
ENDIF(UNIX) ENDIF(UNIX_STYLE_FIND)
ENDIF(WIN32) ENDIF(WIN32_STYLE_FIND)
IF(WXWINDOWS_LIBRARIES) IF(WXWINDOWS_LIBRARIES)