From 1ac7f59fc2d3777f65cc6c952f9a30cd55eda2a3 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 15 Dec 2015 21:40:34 +0200 Subject: [PATCH] fix build of script component for windows Signed-off-by: Ivailo Monev --- src/script/CMakeLists.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt index f82e32213..aeff6c173 100644 --- a/src/script/CMakeLists.txt +++ b/src/script/CMakeLists.txt @@ -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 -- 2.11.0