Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9683 for code/trunk


Ignore:
Timestamp:
Oct 2, 2013, 11:38:00 PM (11 years ago)
Author:
landauf
Message:

mingw with gcc 4.8 has its own version of sdkddkver.h which apparently requires different defines. it looks like those different defines work for all versions of mingw. we use now normal defines for msvc and different defines for mingw.
removed define from win32.c since it's already defined by a compiler flag

Location:
code/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/SourceConfig.cmake

    r9667 r9683  
    4545  # Target Windows XP as minimum Windows version
    4646  # And try to catch all the different macro defines for that...
    47   ADD_COMPILER_FLAGS("-D_WIN32_WINNT=0x0501")
    48   ADD_COMPILER_FLAGS("-D_WIN32_WINDOWS=0x0501")
    49   ADD_COMPILER_FLAGS("-DWINVER=0x0501")
    50   ADD_COMPILER_FLAGS("-DNTDDI_VERSION=0x05010000")
     47  IF(MINGW)
     48    ADD_COMPILER_FLAGS("-D_WIN32_WINNT=0x05010000")
     49    ADD_COMPILER_FLAGS("-D_WIN32_WINDOWS=0x05010000")
     50    ADD_COMPILER_FLAGS("-DWINVER=0x05010000")
     51    ADD_COMPILER_FLAGS("-DNTDDI_VERSION=0x05010000")
     52  ELSE()
     53    ADD_COMPILER_FLAGS("-D_WIN32_WINNT=0x0501")
     54    ADD_COMPILER_FLAGS("-D_WIN32_WINDOWS=0x0501")
     55    ADD_COMPILER_FLAGS("-DWINVER=0x0501")
     56    ADD_COMPILER_FLAGS("-DNTDDI_VERSION=0x05010000")
     57  ENDIF()
    5158ENDIF(WIN32)
    5259
  • code/trunk/src/external/enet/win32.c

    r8351 r9683  
    44*/
    55#ifdef WIN32
    6 
    7 #define _WIN32_WINNT 0x0501
    86
    97#include <time.h>
Note: See TracChangeset for help on using the changeset viewer.