Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10208


Ignore:
Timestamp:
Jan 29, 2015, 10:29:56 AM (5 years ago)
Author:
muemart
Message:

Some small fixes for the MSVC build

  • Don't hardcode library names. It's more trouble than it's worth.
  • Add debug library names for CEBUI 0.8.x
  • Prevent double definitions of winsock stuff
Location:
code/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/PackageConfigMSVC.cmake

    r8361 r10208  
    5454  # Sets the library path for the FIND_LIBRARY
    5555  SET(CMAKE_LIBRARY_PATH ${DEP_LIBRARY_DIR})
    56 
    57   # Certain find scripts don't behave as ecpected to we have
    58   # to specify the libraries ourselves.
    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}/zlib-vc100.lib
    67       debug     ${DEP_LIBRARY_DIR}/zlib-vc100_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()
     56 
    7457  # Part of Platform SDK and usually gets linked automatically
    7558  SET(WMI_LIBRARY  wbemuuid.lib)
  • code/trunk/cmake/tools/FindCEGUI.cmake

    r9675 r10208  
    6464  NAMES
    6565    CEGUIBased CEGUIBase_d CEGUIBaseD CEGUIBase_D
    66     CEGUId CEGUI_d CEGUID CEGUI_D
     66    CEGUId CEGUI_d CEGUID CEGUI_D CEGUIBase-0_d
    6767  PATHS $ENV{CEGUIDIR}
    6868  PATH_SUFFIXES lib bin
     
    8686FIND_LIBRARY(CEGUILUA_LIBRARY_DEBUG
    8787  NAMES CEGUILuad CEGUILua_d CEGUILuaScriptModuled CEGUILuaScriptModule_d
     88  CEGUILuaScriptModule-0_d
    8889  PATHS $ENV{CEGUIDIR} $ENV{CEGUILUADIR}
    8990  PATH_SUFFIXES lib bin
     
    133134  )
    134135  FIND_LIBRARY(CEGUI_OGRE_RENDERER_LIBRARY_DEBUG
    135     NAMES CEGUIOgreRendererd CEGUIOgreRenderer_d
     136    NAMES CEGUIOgreRendererd CEGUIOgreRenderer_d CEGUIOgreRenderer-0_d
    136137    PATHS $ENV{CEGUIDIR} $ENV{CEGUIOGRERENDERERDIR}
    137138    PATH_SUFFIXES lib bin
  • code/trunk/src/libraries/core/CoreIncludes.h

    r10189 r10208  
    8787// resolve macro conflict on windows
    8888#if defined(ORXONOX_PLATFORM_WINDOWS)
     89#   define WIN32_LEAN_AND_MEAN
    8990#   include <windows.h>
    9091#   undef RegisterClass
Note: See TracChangeset for help on using the changeset viewer.