OSDN Git Service

fix build of script component for windows
authorIvailo Monev <xakepa10@gmail.com>
Tue, 15 Dec 2015 19:40:34 +0000 (21:40 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Tue, 15 Dec 2015 19:40:34 +0000 (21:40 +0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/script/CMakeLists.txt

index f82e322..aeff6c1 100644 (file)
@@ -276,16 +276,11 @@ elseif(KATIE_PLATFORM STREQUAL "qpa")
         -framework CoreFoundation
     )
     add_definitions(-DENABLE_JSC_MULTIPLE_THREADS=0)
-elseif(KATIE_PLATFORM STREQUAL "wince")
+elseif(KATIE_PLATFORM MATCHES "(win32|wince)" AND KATIE_COMPILER STREQUAL "msvc")
     include_directories(
         ${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/JavaScriptCore/os-wince
         ${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/JavaScriptCore/os-win32
     )
-    set(EXTRA_SCRIPT_LIBS
-        ${EXTRA_SCRIPT_LIBS}
-        mmtimer
-    )
-    add_definitions(-DWINCEBASIC)
 elseif(KATIE_PLATFORM STREQUAL "integrity")
     set(KATIE_CXXFLAGS
         ${KATIE_CXXFLAGS}
@@ -293,6 +288,17 @@ elseif(KATIE_PLATFORM STREQUAL "integrity")
     )
 endif()
 
+if(KATIE_PLATFORM STREQUAL "wince")
+    add_definitions(-DWINCEBASIC)
+endif()
+
+if(KATIE_PLATFORM MATCHES "(win32|wince)")
+    set(EXTRA_SCRIPT_LIBS
+        ${EXTRA_SCRIPT_LIBS}
+        winmm
+    )
+endif()
+
 set(SCRIPT_RESOURCES
     ${SCRIPT_RESOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/api/qscriptextensionplugin.h