diff --git a/examples/pxScene2d/src/CMakeLists.txt b/examples/pxScene2d/src/CMakeLists.txt index 929cdee4f5..2e6f1e9a93 100644 --- a/examples/pxScene2d/src/CMakeLists.txt +++ b/examples/pxScene2d/src/CMakeLists.txt @@ -90,7 +90,7 @@ add_definitions(-DANIMATION_ROTATE_XYZ ) if(WIN32) set(OPENSSLLIB ${EXTDIR}/openssl-1.0.2o/) set(PXSCENE_LINK_DIRECTORIES ${PXSCENE_LINK_DIRECTORIES} ${OPENSSLLIB}/lib) - + include_directories(AFTER ${OPENSSLLIB}/bin) endif(WIN32) @@ -309,7 +309,7 @@ elseif (WIN32) set(PLATFORM_SOURCES ${PLATFORM_SOURCES} ${PXCOREDIR}/src/utf8.c) set_source_files_properties(utf8.c PROPERTIES LANGUAGE CXX) set(PXSCENE_DEFINITIONS ${PXSCENE_DEFINITIONS} -DHAS_WINDOWS_BREAKPAD) - add_definitions(-DPX_PLATFORM_WIN -DRT_PLATFORM_WINDOWS -DWIN32 -DWIN32_LEAN_AND_MEAN -DGLEW_STATIC -D_TIMESPEC_DEFINED -D_CONSOLE + add_definitions(-DPX_PLATFORM_WIN -DRT_PLATFORM_WINDOWS -DWIN32 -DWIN32_LEAN_AND_MEAN -DGLEW_STATIC -D_TIMESPEC_DEFINED -D_WINDOWS -DCURL_STATICLIB -DRUNINMAIN -DENABLE_RT_NODE -DDISABLE_WAYLAND -DNODE_WANT_INTERNALS=1 -DENABLE_NODE_V_6_9 -DENABLE_V8_HEAP_PARAMS=1 -DV8_DEPRECATION_WARNINGS=1 -DNODE_SHARED_MODE -DENABLE_MAX_TEXTURE_SIZE @@ -536,6 +536,7 @@ if (BUILD_WITH_PXOBJECT_TRACKING) set(PXSCENE_DEFINITIONS ${PXSCENE_DEFINITIONS} -DENABLE_PXOBJECT_TRACKING) endif (BUILD_WITH_PXOBJECT_TRACKING) +set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "/SUBSYSTEM:WINDOWS") set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} ${PXSCENE_LINKER_OPTIONS}) link_directories(${PXSCENE_LINK_DIRECTORIES}) @@ -545,7 +546,7 @@ link_directories(${PXSCENE_LINK_DIRECTORIES}) if (BUILD_PXSCENE_APP) message("Enabling build support for pxscene app") - add_executable(pxscene_app ${PXSCENE_APP_FILES} ${PXSCENE_ADDITIONAL_RESOURCES}) + add_executable(pxscene_app WIN32 ${PXSCENE_APP_FILES} ${PXSCENE_ADDITIONAL_RESOURCES}) set_target_properties(pxscene_app PROPERTIES OUTPUT_NAME ${EXE}) target_link_libraries(pxscene_app ${PXSCENE_APP_LIBRARIES} ${PXSCENE_LINK_LIBRARIES}) add_definitions(${PXSCENE_DEFINITIONS}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9ec759cfb1..67c94c1d52 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -178,9 +178,9 @@ elseif(WIN32) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../build/win) add_definitions(-DENABLE_NODE_V_6_9 -DNODE_PLATFORM=win32 -DNODE_WANT_INTERNALS=1 -DV8_DEPRECATION_WARNINGS=1 -DNODE_SHARED_MODE -DNODE_USE_V8_PLATFORM=1 -DNODE_HAVE_I18N_SUPPORT=1 -DNODE_HAVE_SMALL_ICU=1 ) add_definitions(-DENABLE_RT_NODE -DRUNINMAIN) - add_definitions(-DPX_PLATFORM_WIN -DRT_PLATFORM_WINDOWS -DWIN32 -DWIN32_LEAN_AND_MEAN -DGLEW_STATIC -D_TIMESPEC_DEFINED -D_CONSOLE + add_definitions(-DPX_PLATFORM_WIN -DRT_PLATFORM_WINDOWS -DWIN32 -DWIN32_LEAN_AND_MEAN -DGLEW_STATIC -D_TIMESPEC_DEFINED -D_WINDOWS -DCURL_STATICLIB -DRUNINMAIN -DENABLE_RT_NODE -DDISABLE_WAYLAND -DNODE_WANT_INTERNALS=1 - -DENABLE_NODE_V_6_9 -DENABLE_V8_HEAP_PARAMS=1 -DV8_DEPRECATION_WARNINGS=1 -DNODE_SHARED_MODE + -DENABLE_NODE_V_6_9 -DENABLE_V8_HEAP_PARAMS=1 -DV8_DEPRECATION_WARNINGS=1 -DNODE_SHARED_MODE -DENABLE_MAX_TEXTURE_SIZE -DHAVE_OPENSSL -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_HAS_EXCEPTIONS=0 -DBUILDING_V8_SHARED=1 -DBUILDING_UV_SHARED=1 -DNODE_ARCH="ia32" -DNODE_USE_V8_PLATFORM=1 -DNODE_HAVE_I18N_SUPPORT=1 -DNODE_HAVE_SMALL_ICU=1 @@ -240,7 +240,7 @@ endif() if (SUPPORT_NODE) message("Adding Node scripting support") add_definitions(-DRTSCRIPT_SUPPORT_NODE) - set(PXCORE_FILES ${PXCORE_FILES} rtScriptV8/rtScriptNode.cpp rtScriptV8/jsCallback.cpp rtScriptV8/rtFunctionWrapper.cpp + set(PXCORE_FILES ${PXCORE_FILES} rtScriptV8/rtScriptNode.cpp rtScriptV8/jsCallback.cpp rtScriptV8/rtFunctionWrapper.cpp rtScriptV8/rtObjectWrapper.cpp rtScriptV8/rtWrapperUtils.cpp) if (USE_NODE_10) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") @@ -253,7 +253,7 @@ if (SUPPORT_V8) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-declarations") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-declarations") include_directories(AFTER ${EXTDIR}/uWebSockets/src) - set(PXCORE_FILES ${PXCORE_FILES} rtScriptV8/rtScriptV8.cpp rtScriptV8/jsCallback.cpp rtScriptV8/rtFunctionWrapper.cpp + set(PXCORE_FILES ${PXCORE_FILES} rtScriptV8/rtScriptV8.cpp rtScriptV8/jsCallback.cpp rtScriptV8/rtFunctionWrapper.cpp rtScriptV8/rtObjectWrapper.cpp rtScriptV8/rtWrapperUtils.cpp rtScriptV8/rtWebSocket.cpp ${V8_SOURCES}) endif()