Преглед изворни кода

Appending PLATFORM_LIBRARIES instead of redefining them

freiro пре 9 година
родитељ
комит
35e979f041
1 измењених фајлова са 3 додато и 3 уклоњено
  1. 3 3
      CMakeLists.txt

+ 3 - 3
CMakeLists.txt

@@ -183,12 +183,12 @@ IF (APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
 ELSEIF (WIN32)
 ELSEIF (WIN32)
-    #WSAPoll and other fileutil.cpp functionalities didn't exist before WinNT 6.x (Vista and up)
+    # WSAPoll and SHGetKnownFolderPath (AppData/Roaming) didn't exist before WinNT 6.x (Vista)
     add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600)
     add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600)
     set(PLATFORM_LIBRARIES winmm ws2_32)
     set(PLATFORM_LIBRARIES winmm ws2_32)
-    if (MINGW)
+    IF (MINGW)
         # PSAPI is the Process Status API
         # PSAPI is the Process Status API
-        set(PLATFORM_LIBRARIES winmm ws2_32 psapi imm32 version)
+        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version)
     ENDIF (MINGW)
     ENDIF (MINGW)
 ELSEIF (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
 ELSEIF (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
     set(PLATFORM_LIBRARIES rt)
     set(PLATFORM_LIBRARIES rt)