Bladeren bron

Build tweaks

JoshEngebretson 10 jaren geleden
bovenliggende
commit
42a93bcb83
3 gewijzigde bestanden met toevoegingen van 4 en 24 verwijderingen
  1. 1 1
      .gitignore
  2. 1 21
      CMake/Modules/AtomicWindows.cmake
  3. 2 2
      Source/ThirdParty/Duktape/CMakeLists.txt

+ 1 - 1
.gitignore

@@ -4,7 +4,7 @@
 Bin/Atomic.d.ts
 Bin/Atomic.d.ts
 Bin/Atomic.js
 Bin/Atomic.js
 Bin/*.pak
 Bin/*.pak
-Bin/NativeSDK/*
+Bin/NativePluginSDK/*
 Source/Atomic/Javascript/Modules/*
 Source/Atomic/Javascript/Modules/*
 Data/AtomicPlayer/Resources/CoreData/Shaders/HLSL/Cache
 Data/AtomicPlayer/Resources/CoreData/Shaders/HLSL/Cache
 Artifacts/*
 Artifacts/*

+ 1 - 21
CMake/Modules/AtomicWindows.cmake

@@ -11,28 +11,8 @@ add_definitions(-DATOMIC_PLATFORM_WINDOWS -D_CRT_SECURE_NO_WARNINGS -DATOMIC_TBU
 list (APPEND ATOMIC_LINK_LIBRARIES MojoShader user32 gdi32 winmm imm32 ole32 oleaut32 version uuid d3d9 d3dcompiler Ws2_32)
 list (APPEND ATOMIC_LINK_LIBRARIES MojoShader user32 gdi32 winmm imm32 ole32 oleaut32 version uuid d3d9 d3dcompiler Ws2_32)
 
 
 # compile with static runtime
 # compile with static runtime
-set(CompilerFlags
-    CMAKE_CXX_FLAGS
-    CMAKE_CXX_FLAGS_DEBUG
-    CMAKE_CXX_FLAGS_RELEASE
-    CMAKE_C_FLAGS
-    CMAKE_C_FLAGS_DEBUG
-    CMAKE_C_FLAGS_RELEASE
-)
+set(CompilerFlags CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE)
 
 
 foreach(CompilerFlag ${CompilerFlags})
 foreach(CompilerFlag ${CompilerFlags})
     string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
     string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
 endforeach()
 endforeach()
-
-set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} /fp:fast /Zi /GS-")
-set (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} /fp:fast /Zi /GS- /D _SECURE_SCL=0")
-set (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-# SSE flag is redundant if already compiling as 64bit
-if (ATOMIC_SSE AND NOT ATOMIC_64BIT)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:SSE")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE")
-endif ()
-set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF /DEBUG")
-set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF")
-

+ 2 - 2
Source/ThirdParty/Duktape/CMakeLists.txt

@@ -14,7 +14,7 @@ if (MSVC)
 	add_library(AtomicPlugin ${SOURCE_FILES})
 	add_library(AtomicPlugin ${SOURCE_FILES})
 	add_custom_command (TARGET AtomicPlugin POST_BUILD
 	add_custom_command (TARGET AtomicPlugin POST_BUILD
     COMMAND ${CMAKE_COMMAND}
     COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy_if_different \"${CMAKE_CURRENT_SOURCE_DIR}/duktape.h\" \"${CMAKE_SOURCE_DIR}/Bin/NativeSDK/Windows/AtomicPlugin.h\"
+    ARGS -E copy_if_different \"${CMAKE_CURRENT_SOURCE_DIR}/duktape.h\" \"${CMAKE_SOURCE_DIR}/Bin/NativePluginSDK/Windows/AtomicPlugin.h\"
     COMMAND ${CMAKE_COMMAND}
     COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy \"$<TARGET_LINKER_FILE:AtomicPlugin>\" \"${CMAKE_SOURCE_DIR}/Bin/NativeSDK/Windows/x64/$<TARGET_LINKER_FILE_NAME:AtomicPlugin>\")
+    ARGS -E copy \"$<TARGET_LINKER_FILE:AtomicPlugin>\" \"${CMAKE_SOURCE_DIR}/Bin/NativePluginSDK/Windows/x64/$<TARGET_LINKER_FILE_NAME:AtomicPlugin>\")
 endif()
 endif()