Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8221 for code/branches/kicklib


Ignore:
Timestamp:
Apr 10, 2011, 3:28:27 AM (14 years ago)
Author:
rgrieder
Message:

Changes that allow the Visual Studio 2010 dependencies to be used.

Location:
code/branches/kicklib
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/kicklib/cmake/LibraryConfig.cmake

    r8123 r8221  
    5858  ELSEIF(MSVC90)
    5959    SET(_compiler_prefix msvc9)
    60   ELSEIF(MSVC100)
     60  ELSEIF(MSVC10)
    6161    SET(_compiler_prefix msvc10)
    6262  ENDIF()
  • code/branches/kicklib/cmake/PackageConfigMSVC.cmake

    r8073 r8221  
    5757  # Certain find scripts don't behave as ecpected to we have
    5858  # 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()
    6174  # Part of Platform SDK and usually gets linked automatically
    6275  SET(WMI_LIBRARY  wbemuuid.lib)
  • code/branches/kicklib/cmake/tools/FindOgg.cmake

    r8068 r8221  
    2222)
    2323FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED
    24   NAMES ogg ogg-0
     24  NAMES ogg ogg-0 libogg
    2525  PATHS $ENV{OGGDIR}
    2626  PATH_SUFFIXES lib
    2727)
    2828FIND_LIBRARY(OGG_LIBRARY_DEBUG
    29   NAMES oggd ogg_d oggD ogg_D
     29  NAMES oggd ogg_d oggD ogg_D libogg_d
    3030  PATHS $ENV{OGGDIR}
    3131  PATH_SUFFIXES lib
  • code/branches/kicklib/cmake/tools/FindVorbis.cmake

    r8068 r8221  
    2222)
    2323FIND_LIBRARY(VORBIS_LIBRARY_OPTIMIZED
    24   NAMES vorbis vorbis-0
     24  NAMES vorbis vorbis-0 libvorbis
    2525  PATHS $ENV{VORBISDIR}
    2626  PATH_SUFFIXES lib
    2727)
    2828FIND_LIBRARY(VORBIS_LIBRARY_DEBUG
    29   NAMES vorbisd vorbis_d vorbisD vorbis_D
     29  NAMES vorbisd vorbis_d vorbisD vorbis_D libvorbis_d
    3030  PATHS $ENV{VORBISDIR}
    3131  PATH_SUFFIXES lib
    3232)
    3333FIND_LIBRARY(VORBISFILE_LIBRARY_OPTIMIZED
    34   NAMES vorbisfile vorbisfile-3
     34  NAMES vorbisfile vorbisfile-3 libvorbisfile
    3535  PATHS $ENV{VORBISDIR}
    3636  PATH_SUFFIXES lib
    3737)
    3838FIND_LIBRARY(VORBISFILE_LIBRARY_DEBUG
    39   NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D
     39  NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D libvorbisfile_d
    4040  PATHS $ENV{VORBISDIR}
    4141  PATH_SUFFIXES lib
  • code/branches/kicklib/src/CMakeLists.txt

    r8216 r8221  
    4141#ADD_COMPILER_FLAGS("-DENET_DLL"           WIN32 LINK_ENET_DYNAMIC)
    4242ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL"   WIN32 LINK_LUA5.1_DYNAMIC)
    43 ADD_COMPILER_FLAGS("-DZLIB_DLL"          WIN32 LINK_ZLIB_DYNAMIC)
     43ADD_COMPILER_FLAGS("-DZLIB_DLL -DZLIB_WINAPI" WIN32 LINK_ZLIB_DYNAMIC)
    4444# If no defines are specified, these libs get linked dynamically
    4545ADD_COMPILER_FLAGS("-DCEGUI_STATIC -DTOLUA_STATIC" WIN32 NOT LINK_CEGUI_DYNAMIC)
Note: See TracChangeset for help on using the changeset viewer.