Browse Source

Add a variable "ATOMIC_DOTNET_DEV" to guard against building WIP C#

JoshEngebretson 10 years ago
parent
commit
61a7c09c3c

+ 3 - 1
CMake/Modules/AtomicNET.cmake

@@ -1,5 +1,7 @@
 
-# add_definitions ( -DATOMIC_DOTNET )
+if (ATOMIC_DOTNET_DEV)
+add_definitions ( -DATOMIC_DOTNET )
+endif ()
 
 set (CSATOMICNATIVEDIR "${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/CSharp/Packages/Atomic/Native")
 set (CSATOMICPLAYERNATIVEDIR "${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/CSharp/Packages/AtomicPlayer/Native")

+ 1 - 1
CMake/Modules/AtomicWindows.cmake

@@ -11,7 +11,7 @@ else()
     set (D3DCOMPILER_47_DLL ${CMAKE_SOURCE_DIR}/Build/Windows/Binaries/x86/D3DCompiler_47.dll)
 endif()
 
-add_definitions(-DATOMIC_PLATFORM_WINDOWS -D_CRT_SECURE_NO_WARNINGS -DATOMIC_TBUI -DATOMIC_DOTNET)
+add_definitions(-DATOMIC_PLATFORM_WINDOWS -D_CRT_SECURE_NO_WARNINGS -DATOMIC_TBUI )
 
 list (APPEND ATOMIC_LINK_LIBRARIES MojoShader user32 gdi32 winmm imm32 ole32 oleaut32 version uuid Ws2_32)
 

+ 11 - 5
Source/AtomicTool/CMakeLists.txt

@@ -32,6 +32,9 @@ add_custom_command(TARGET AtomicTool POST_BUILD
                    COMMAND $<TARGET_FILE:AtomicTool> bind "\"${CMAKE_SOURCE_DIR}\"" "Script/Packages/AtomicNET/" "${JAVASCRIPT_BINDINGS_PLATFORM}"
                    COMMENT "Generating Script Bindings")
 
+
+if (ATOMIC_DOTNET_DEV)
+
 if (NOT EXISTS ${CMAKE_SOURCE_DIR}/Artifacts/AtomicNET/TPA)
  file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/Artifacts/AtomicNET/TPA)
 endif()
@@ -43,8 +46,9 @@ endif()
 if (MSVC)
 
 add_custom_command(TARGET AtomicTool POST_BUILD
-                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Script/AtomicNET/AtomicNET/
-                   COMMAND  ${CMAKE_SOURCE_DIR}/Script/AtomicNET/AtomicNET/build.cmd
+                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Artifacts/AtomicNET/Build/
+                   COMMAND $<TARGET_FILE:AtomicTool> net-projectgen "\"${CMAKE_SOURCE_DIR}/Script/AtomicNET/AtomicNETProjects.json\"" WINDOWS
+                   COMMAND msbuild
                    COMMENT "Compiling AtomicNET Assemblies")
 elseif(APPLE)
 
@@ -59,8 +63,10 @@ add_custom_command(TARGET AtomicTool POST_BUILD
                    COMMAND $<TARGET_FILE:AtomicTool> net-projectgen "\"${CMAKE_SOURCE_DIR}/Script/AtomicNET/AtomicNETProjects.json\"" MACOSX
                    COMMAND /usr/local/bin/xbuild
                    COMMENT "Compiling AtomicNET Assemblies")
-endif()
+endif(IOS)
 
-endif()
+endif(APPLE)
 
-endif()
+endif(MSVC)
+
+endif(ATOMIC_DOTNET_DEV)