Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11113 for code/trunk/cmake


Ignore:
Timestamp:
Feb 14, 2016, 3:42:37 PM (8 years ago)
Author:
landauf
Message:

updated build-script to work with mingw-w64 and the new dependency package

Location:
code/trunk/cmake
Files:
2 edited

Legend:

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

    r11097 r11113  
    127127
    128128IF(WIN32)
    129   FIND_PACKAGE(DbgHelp)
    130   FIND_PACKAGE(DirectX       REQUIRED)
    131129  IF(MSVC)
    132130    # Check whether we can use Visual Leak Detector
    133131    FIND_PACKAGE(VLD QUIET)
     132    FIND_PACKAGE(DbgHelp)
     133    FIND_PACKAGE(DirectX       REQUIRED)
    134134  ENDIF()
    135135ENDIF()
  • code/trunk/cmake/PackageConfigMinGW.cmake

    r9687 r11113  
    2929
    3030  INCLUDE(CheckPackageVersion)
    31   CHECK_PACKAGE_VERSION(6.0 7.0)
     31  CHECK_PACKAGE_VERSION(7.1)
    3232
    3333  # 64 bit system?
     
    5353  SET(ZLIB_LIBRARY ${DEP_BINARY_DIR}/libzlib.dll CACHE FILEPATH "")
    5454
    55   # Not included in MinGW, so we need to supply it for OIS
    56   SET(WMI_INCLUDE_DIR ${DEP_INCLUDE_DIR}/wmi/include)
    57   SET(WMI_LIBRARY     ${DEP_LIBRARY_DIR}/wbemuuid.lib)
     55  # Define libraries that are part of mingw64:
     56  #  - DirectX (Needed for OIS):
     57  SET(DIRECTX_LIBRARIES dinput8 dxguid)
     58  SET(WMI_LIBRARY wbemuuid)
     59  #  - DbgHelp (Needed for SignalHandler in util library):
     60  SET(DBGHELP_FOUND true)
     61  SET(DBGHELP_LIBRARY dbghelp)
    5862
    5963ENDIF(MINGW)
Note: See TracChangeset for help on using the changeset viewer.