Build cleanups for running without Atomic C# enabled

CMake/Modules/AtomicDesktop.cmake

@@ -1,5 +1,7 @@
 include_directories(${CMAKE_SOURCE_DIR}/Source/ThirdParty/Poco/Foundation/include)
 
-add_definitions( -DATOMIC_TBUI -DATOMIC_FILEWATCHER -DPOCO_NO_AUTOMATIC_LIBS)
+add_definitions( -DATOMIC_TBUI -DATOMIC_FILEWATCHER -DPOCO_NO_AUTOMATIC_LIBS -DPOCO_STATIC )
 
 set (ATOMIC_LINK_LIBRARIES ${ATOMIC_LINK_LIBRARIES} LibCpuId SQLite)
+
+include(AtomicNET)

CMake/Modules/AtomicMac.cmake

@@ -1,15 +1,13 @@
 
-include (BundleUtilities)
-include(AtomicDesktop)
-
 set (JAVASCRIPT_BINDINGS_PLATFORM "MACOSX")
 
-include(AtomicNET)
+include (BundleUtilities)
+include(AtomicDesktop)
 
 # only have 32 bit mono installed, fix this
 # set (CMAKE_OSX_ARCHITECTURES i386)
 
-add_definitions(-DATOMIC_PLATFORM_OSX -DATOMIC_OPENGL -DATOMIC_DOTNET -DKNET_UNIX)
+add_definitions(-DATOMIC_PLATFORM_OSX -DATOMIC_OPENGL -DKNET_UNIX)
 
 if (CMAKE_GENERATOR STREQUAL "Xcode")
 

CMake/Modules/AtomicNET.cmake

@@ -1,8 +1,11 @@
+
+# add_definitions ( -DATOMIC_DOTNET )
+
 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")
 set (CSATOMICNETNATIVEDIR "${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/CSharp/Packages/AtomicNET/Native")
 
-# Create the JSBind files ahead of time, so they are picked up with glob
+# Create the binding files ahead of time, so they are picked up with glob
 
 set (CSFILES CSModuleAtomic2D.cpp;CSModuleAtomic3D.cpp;CSModuleAudio.cpp;CSModuleContainer.cpp;CSModuleCore.cpp;
              CSModuleEngine.cpp;CSModuleEnvironment.cpp;CSModuleGraphics.cpp;CSModuleInput.cpp;

CMake/Modules/AtomicWindows.cmake

@@ -1,9 +1,7 @@
 
-include(AtomicDesktop)
-
 set (JAVASCRIPT_BINDINGS_PLATFORM "WINDOWS")
 
-include(AtomicNET)
+include(AtomicDesktop)
 
 #set (CMAKE_DEBUG_POSTFIX _d)
 

CMakeLists.txt

@@ -11,8 +11,6 @@ add_definitions(-DATOMIC_ROOT_SOURCE_DIR="${CMAKE_SOURCE_DIR}" -DATOMIC_ROOT_BUI
 
 add_definitions( -DATOMIC_API= -DATOMIC_STATIC_DEFINE -DATOMIC_ATOMIC2D -DATOMIC_LOGGING -DATOMIC_PROFILING)
 
-add_definitions( -DPOCO_STATIC )
-
 if (NOT DEFINED ATOMIC_DEV_BUILD)
     set(ATOMIC_DEV_BUILD 1)
 ENDIF()

Source/AtomicEditor/Application/AEEditorCommon.cpp

@@ -73,7 +73,9 @@ void AEEditorCommon::Setup()
     RegisterEnvironmentLibrary(context_);
 #endif
 
+#ifdef ATOMIC_DOTNET
     RegisterNETScriptLibrary(context_);
+#endif
 
     // Register IPC system
     context_->RegisterSubsystem(new IPC(context_));

Source/AtomicTool/CMakeLists.txt

@@ -50,6 +50,10 @@ elseif(APPLE)
 
 if (NOT IOS)
 
+# if we have xbuild available
+
+if(EXISTS "/usr/local/bin/xbuild")
+
 add_custom_command(TARGET AtomicTool POST_BUILD
                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Artifacts/AtomicNET/Build/
                    COMMAND $<TARGET_FILE:AtomicTool> net-projectgen "\"${CMAKE_SOURCE_DIR}/Script/AtomicNET/AtomicNETProjects.json\"" MACOSX
@@ -58,3 +62,5 @@ add_custom_command(TARGET AtomicTool POST_BUILD
 endif()
 
 endif()
+
+endif()

Source/ToolCore/Assets/Asset.cpp

@@ -295,7 +295,9 @@ bool Asset::CreateImporter()
         else if (ext == ".dll")
         {
             // TODO: check for native dll
+#ifdef ATOMIC_DOTNET
             importer_ = new NETAssemblyImporter(context_, this);
+#endif
         }
         else if (textureFormats.Contains(ext))
         {

Source/ToolCore/Assets/AssetDatabase.cpp

@@ -497,9 +497,13 @@ String AssetDatabase::GetResourceImporterName(const String& resourceTypeName)
         resourceTypeToImporterType_["Texture2D"] = "TextureImporter";
         resourceTypeToImporterType_["Sprite2D"] = "TextureImporter";
         resourceTypeToImporterType_["AnimatedSprite2D"] = "SpriterImporter";
-        resourceTypeToImporterType_["JSComponentFile"] = "JavascriptImporter";
-        resourceTypeToImporterType_["CSComponentAssembly"] = "NETAssemblyImporter";
+        resourceTypeToImporterType_["JSComponentFile"] = "JavascriptImporter";        
         resourceTypeToImporterType_["ParticleEffect2D"] = "PEXImporter";
+
+#ifdef ATOMIC_DOTNET
+        resourceTypeToImporterType_["CSComponentAssembly"] = "NETAssemblyImporter";
+#endif
+
     }
 
     if (!resourceTypeToImporterType_.Contains(resourceTypeName))

Source/ToolCore/ToolSystem.cpp

@@ -20,8 +20,6 @@
 #include "License/LicenseSystem.h"
 #include "Build/BuildSystem.h"
 #include "Subprocess/SubprocessSystem.h"
-#include "NETTools/NETToolSystem.h"
-
 
 #include "ToolSystem.h"
 #include "ToolEnvironment.h"
@@ -30,6 +28,10 @@
 #include "Project/Project.h"
 #include "Project/ProjectUserPrefs.h"
 
+#ifdef ATOMIC_DOTNET
+#include "NETTools/NETToolSystem.h"
+#endif
+
 namespace ToolCore
 {
 
@@ -41,7 +43,10 @@ ToolSystem::ToolSystem(Context* context) : Object(context),
     context_->RegisterSubsystem(new LicenseSystem(context_));
     context_->RegisterSubsystem(new BuildSystem(context_));
     context_->RegisterSubsystem(new SubprocessSystem(context_));
+
+#ifdef ATOMIC_DOTNET
     context_->RegisterSubsystem(new NETToolSystem(context_));
+#endif
 
     // platform registration
     RegisterPlatform(new PlatformMac(context));