Changeset 8221 for code/branches/kicklib
- Timestamp:
- Apr 10, 2011, 3:28:27 AM (14 years ago)
- Location:
- code/branches/kicklib
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib/cmake/LibraryConfig.cmake
r8123 r8221 58 58 ELSEIF(MSVC90) 59 59 SET(_compiler_prefix msvc9) 60 ELSEIF(MSVC10 0)60 ELSEIF(MSVC10) 61 61 SET(_compiler_prefix msvc10) 62 62 ENDIF() -
code/branches/kicklib/cmake/PackageConfigMSVC.cmake
r8073 r8221 57 57 # Certain find scripts don't behave as ecpected to we have 58 58 # to specify the libraries ourselves. 59 SET(TCL_LIBRARY ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "") 60 SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib CACHE FILEPATH "") 59 IF(MSVC10) 60 SET(TCL_LIBRARY 61 optimized ${DEP_LIBRARY_DIR}/tcl85t.lib 62 debug ${DEP_LIBRARY_DIR}/tcl85tg.lib 63 CACHE FILEPATH "" 64 ) 65 SET(ZLIB_LIBRARY 66 optimized ${DEP_LIBRARY_DIR}/zlibwapi.lib 67 debug ${DEP_LIBRARY_DIR}/zlibwapi_d.lib 68 CACHE FILEPATH "" 69 ) 70 ELSE() 71 SET(TCL_LIBRARY ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "") 72 SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib CACHE FILEPATH "") 73 ENDIF() 61 74 # Part of Platform SDK and usually gets linked automatically 62 75 SET(WMI_LIBRARY wbemuuid.lib) -
code/branches/kicklib/cmake/tools/FindOgg.cmake
r8068 r8221 22 22 ) 23 23 FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED 24 NAMES ogg ogg-0 24 NAMES ogg ogg-0 libogg 25 25 PATHS $ENV{OGGDIR} 26 26 PATH_SUFFIXES lib 27 27 ) 28 28 FIND_LIBRARY(OGG_LIBRARY_DEBUG 29 NAMES oggd ogg_d oggD ogg_D 29 NAMES oggd ogg_d oggD ogg_D libogg_d 30 30 PATHS $ENV{OGGDIR} 31 31 PATH_SUFFIXES lib -
code/branches/kicklib/cmake/tools/FindVorbis.cmake
r8068 r8221 22 22 ) 23 23 FIND_LIBRARY(VORBIS_LIBRARY_OPTIMIZED 24 NAMES vorbis vorbis-0 24 NAMES vorbis vorbis-0 libvorbis 25 25 PATHS $ENV{VORBISDIR} 26 26 PATH_SUFFIXES lib 27 27 ) 28 28 FIND_LIBRARY(VORBIS_LIBRARY_DEBUG 29 NAMES vorbisd vorbis_d vorbisD vorbis_D 29 NAMES vorbisd vorbis_d vorbisD vorbis_D libvorbis_d 30 30 PATHS $ENV{VORBISDIR} 31 31 PATH_SUFFIXES lib 32 32 ) 33 33 FIND_LIBRARY(VORBISFILE_LIBRARY_OPTIMIZED 34 NAMES vorbisfile vorbisfile-3 34 NAMES vorbisfile vorbisfile-3 libvorbisfile 35 35 PATHS $ENV{VORBISDIR} 36 36 PATH_SUFFIXES lib 37 37 ) 38 38 FIND_LIBRARY(VORBISFILE_LIBRARY_DEBUG 39 NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D 39 NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D libvorbisfile_d 40 40 PATHS $ENV{VORBISDIR} 41 41 PATH_SUFFIXES lib -
code/branches/kicklib/src/CMakeLists.txt
r8216 r8221 41 41 #ADD_COMPILER_FLAGS("-DENET_DLL" WIN32 LINK_ENET_DYNAMIC) 42 42 ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL" WIN32 LINK_LUA5.1_DYNAMIC) 43 ADD_COMPILER_FLAGS("-DZLIB_DLL "WIN32 LINK_ZLIB_DYNAMIC)43 ADD_COMPILER_FLAGS("-DZLIB_DLL -DZLIB_WINAPI" WIN32 LINK_ZLIB_DYNAMIC) 44 44 # If no defines are specified, these libs get linked dynamically 45 45 ADD_COMPILER_FLAGS("-DCEGUI_STATIC -DTOLUA_STATIC" WIN32 NOT LINK_CEGUI_DYNAMIC)
Note: See TracChangeset
for help on using the changeset viewer.