Sfoglia il codice sorgente

Merge topic 'windows-ce-cleanup'

7079f33d WindowsCE: Drop unused Platform/WindowsCE-MSVC module
05373f7e WindowsCE: Refactor setting of "WINCE"
1acde6b0 MSVC: Use STREQUAL to check for WindowsCE
Brad King 11 anni fa
parent
commit
8cd83e0b71

+ 1 - 4
Modules/Platform/Windows-MSVC.cmake

@@ -36,13 +36,10 @@ else()
   set(CMAKE_CL_NOLOGO "/nologo")
 endif()
 
-set(WIN32 1)
-
-if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE")
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsCE")
   set(CMAKE_CREATE_WIN32_EXE "/entry:WinMainCRTStartup")
   set(CMAKE_CREATE_CONSOLE_EXE "/entry:mainACRTStartup")
   set(_PLATFORM_LINK_FLAGS " /subsystem:windowsce")
-  set(WINCE 1)
 else()
   set(CMAKE_CREATE_WIN32_EXE "/subsystem:windows")
   set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:console")

+ 4 - 0
Modules/Platform/Windows.cmake

@@ -1,5 +1,9 @@
 set(WIN32 1)
 
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsCE")
+  set(WINCE 1)
+endif()
+
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
 set(CMAKE_STATIC_LIBRARY_SUFFIX ".lib")
 set(CMAKE_SHARED_LIBRARY_PREFIX "")          # lib

+ 0 - 1
Modules/Platform/WindowsCE-MSVC.cmake

@@ -1 +0,0 @@
-include(Platform/Windows-MSVC)