Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8230 for code/branches/kicklib


Ignore:
Timestamp:
Apr 11, 2011, 3:37:14 AM (14 years ago)
Author:
rgrieder
Message:

Zlib should now work again with MSVC < 10.

Location:
code/branches/kicklib
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/kicklib/cmake/PackageConfigMSVC.cmake

    r8221 r8230  
    6464    )
    6565    SET(ZLIB_LIBRARY
    66       optimized ${DEP_LIBRARY_DIR}/zlibwapi.lib
    67       debug     ${DEP_LIBRARY_DIR}/zlibwapi_d.lib
     66      optimized ${DEP_LIBRARY_DIR}/zlib-vc100.lib
     67      debug     ${DEP_LIBRARY_DIR}/zlib-vc100_d.lib
    6868      CACHE FILEPATH ""
    6969    )

  • code/branches/kicklib/src/CMakeLists.txt

    r8221 r8230  
    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 -DZLIB_WINAPI" WIN32 LINK_ZLIB_DYNAMIC)
    4443# If no defines are specified, these libs get linked dynamically
    4544ADD_COMPILER_FLAGS("-DCEGUI_STATIC -DTOLUA_STATIC" WIN32 NOT LINK_CEGUI_DYNAMIC)
Note: See TracChangeset for help on using the changeset viewer.