Merge pull request #20 from AtomicGameEngine/build

Build Improvements

.gitignore

@@ -2,6 +2,7 @@
 *.user
 Bin/Atomic.d.ts
 Bin/Atomic.js
+Bin/*.pak
 Source/Atomic/Javascript/Modules/*
 Artifacts/*
 Build/*

CMake/Modules/AtomicWindows.cmake

@@ -6,7 +6,7 @@ set (CMAKE_DEBUG_POSTFIX _d)
 
 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 d3d9 d3dcompiler)
+list (APPEND ATOMIC_LINK_LIBRARIES MojoShader user32 gdi32 winmm imm32 ole32 oleaut32 version uuid d3d9 d3dcompiler Ws2_32)
 
 # compile with static runtime
 set(CompilerFlags

CMakeLists.txt

@@ -1,11 +1,11 @@
 
 project (Atomic)
 
-cmake_minimum_required (VERSION 3.0.0)
+cmake_minimum_required (VERSION 3.0.2)
 
 set (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
 
-add_definitions( -DATOMIC_STATIC_DEFINE -DATOMIC_LOGGING -DATOMIC_PHYSICS -DATOMIC_ATOMIC2D )
+add_definitions( -DATOMIC_API= -DATOMIC_STATIC_DEFINE -DATOMIC_LOGGING -DATOMIC_PHYSICS -DATOMIC_ATOMIC2D )
 
 # this is here as QtCreator is having trouble picking up #include <Atomic/*> without it
 include_directories(${CMAKE_SOURCE_DIR}/Source ${CMAKE_SOURCE_DIR}/Source/AtomicEditor/Source)
@@ -34,7 +34,7 @@ elseif(ANDROID)
     include(AtomicAndroid)
 
 elseif(EMSCRIPTEN)    
-	
+
 	include(AtomicWeb)
 
 endif()

Source/Atomic/Atomic.h

@@ -47,7 +47,9 @@
 #else
 
 #ifdef ATOMIC_STATIC_DEFINE
+#ifndef ATOMIC_API
 #  define ATOMIC_API
+#endif
 #  define ATOMIC_NO_EXPORT
 #else
 #  ifndef ATOMIC_API

Source/Atomic/CMakeLists.txt

@@ -19,14 +19,12 @@ file (GLOB NAVIGATION_SOURCE Navigation/*.cpp Navigation/*.h)
 file (GLOB NETWORK_SOURCE Network/*.cpp Network/*.h)
 file (GLOB ENVIRONMENT_SOURCE Environment/*.cpp Environment/*.h)
 file (GLOB ATOMIC2D_SOURCE Atomic2D/*.cpp Atomic2D/*.h)
-file (GLOB JAVASCRIPT_SOURCE Javascript/*.cpp Javascript/*.h)
 file (GLOB SCENE_SOURCE Scene/*.cpp Scene/*.h)
 file (GLOB UI_SOURCE UI/*.cpp UI/*.h)
 
 file (GLOB GRAPHICS_SOURCE Graphics/*.cpp Graphics/*.h)
 
 if (MSVC)
-    set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "WINDOWS")  
     file (GLOB GRAPHICS_IMPL_SOURCE Graphics/Direct3D9/*.cpp Graphics/Direct3D9/*.h)
 else()
 
@@ -38,32 +36,25 @@ endif()
 
 if (ANDROID)
   
-  set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "ANDROID")  
-
 endif()
 
 if (APPLE)
-    if (NOT IOS)
-      set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "MACOSX")  
+    if (NOT IOS)      
       set (PLATFORM_SOURCE IO/MacFileWatcher.mm)
-    else()
-      set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "IOS")  
+    else()      
     endif()
 endif()
 
 if (EMSCRIPTEN)
-  set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "WEB")  
-endif()
 
-
-file (GLOB JAVASCRIPT_BINDINGS_SOURCE ${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_SOURCE_FOLDER}/Javascript/Modules/*.cpp)
+endif()
 
 set (SOURCE_FILES ${CONTAINER_SOURCE} ${CORE_SOURCE} ${ENGINE_SOURCE} ${INPUT_SOURCE}
                   ${AUDIO_SOURCE} ${IO_SOURCE} ${MATH_SOURCE} 
                   ${RESOURCE_SOURCE} ${PHYSICS_SOURCE}
                   ${GRAPHICS_SOURCE} ${GRAPHICS_IMPL_SOURCE}                  
                   ${ATOMIC2D_SOURCE} ${ENVIRONMENT_SOURCE}
-                  ${JAVASCRIPT_SOURCE} ${JAVASCRIPT_BINDINGS_SOURCE} ${SCENE_SOURCE} ${UI_SOURCE}
+                  ${SCENE_SOURCE} ${UI_SOURCE}
                   ${PLATFORM_SOURCE})
 
 if (NOT EMSCRIPTEN)

Source/AtomicEditor/AtomicEditorWindows.cmake

@@ -0,0 +1,4 @@
+
+
+
+

Source/AtomicEditor/CMakeLists.txt

@@ -1,10 +1,8 @@
-
 include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/rapidjson/include
                      ${CMAKE_SOURCE_DIR}/Source/ThirdParty
                      ${CMAKE_CURRENT_SOURCE_DIR}/Vendor/nativefiledialog
                      ${CMAKE_CURRENT_SOURCE_DIR}/Vendor/Poco/Foundation/include)
 
-
 file (GLOB_RECURSE SOURCE_FILES Source/*.cpp Source/*.h)
 
 add_definitions(-DPOCO_NO_AUTOMATIC_LIBS)
@@ -31,16 +29,13 @@ add_subdirectory(Vendor)
 
 add_executable(AtomicEditor ${EXE_TYPE} ${SOURCE_FILES} ${ATOMIC_EDITOR_ICON})
 
-target_link_libraries(AtomicEditor ${ATOMIC_LINK_LIBRARIES} Poco)
+target_link_libraries(AtomicEditor ${ATOMIC_LINK_LIBRARIES} AtomicJS Poco)
 
-if (APPLE)
-    
+if (APPLE)    
     set (TARGET_PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.template)
     target_link_libraries(AtomicEditor curl)
 else()
-
     target_link_libraries(AtomicEditor libcurl Iphlpapi Wldap32)
-
 endif()
 
 if (TARGET_PROPERTIES)

Source/AtomicEditor/Source/AEApplication.cpp

@@ -20,9 +20,6 @@
 #include <Atomic/Input/Input.h>
 
 #include <Atomic/UI/TBUI.h>
-
-#include <Atomic/Javascript/Javascript.h>
-
 #include <Atomic/Environment/Environment.h>
 #include <Atomic/Graphics/Renderer.h>
 
@@ -45,6 +42,8 @@
 
 #include "Tools/External/AEExternalTooling.h"
 
+#include <AtomicJS/Javascript/Javascript.h>
+
 DEFINE_APPLICATION_MAIN(AtomicEditor::AEApplication);
 
 namespace AtomicEditor
@@ -71,12 +70,12 @@ void AEApplication::Start()
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
 
 #ifdef __APPLE__    
-    String editorResources = fileSystem->GetAppBundleResourceFolder() + "EditorData/";
+    String editorResources = fileSystem->GetAppBundleResourceFolder() + "EditorData.pak";
 #else
-    String editorResources = fileSystem->GetProgramDir() + "EditorData/";
+    String editorResources = fileSystem->GetProgramDir() + "EditorData.pak";
 #endif    
-    assert(fileSystem->DirExists(editorResources));
-    cache->AddResourceDir(editorResources);
+    assert(fileSystem->FileExists(editorResources));
+    cache->AddPackageFile(editorResources);
 
     // initialize after EditorResources set
     TBUI* tbui = GetSubsystem<TBUI>();

Source/AtomicEditor/Source/AEEditor.cpp

@@ -9,9 +9,10 @@
 #include <Atomic/Resource/ResourceCache.h>
 #include <Atomic/Input/Input.h>
 #include <Atomic/UI/TBUI.h>
-#include <Atomic/Javascript/Javascript.h>
 #include <Atomic/Core/CoreEvents.h>
 
+#include <AtomicJS/Javascript/Javascript.h>
+
 #include "AEEditor.h"
 
 #include "AEPreferences.h"

Source/AtomicEditor/Source/Player/AEPlayer.cpp

@@ -8,12 +8,14 @@
 #include <Atomic/IO/FileSystem.h>
 #include <Atomic/Input/Input.h>
 #include <Atomic/Resource/ResourceCache.h>
-#include <Atomic/Javascript/Javascript.h>
-#include <Atomic/Javascript/JSVM.h>
-#include <Atomic/Javascript/JSEvents.h>
 #include <Atomic/UI/TBUI.h>
 #include <Atomic/UI/UI.h>
 
+#include <AtomicJS/Javascript/Javascript.h>
+#include <AtomicJS/Javascript/JSVM.h>
+#include <AtomicJS/Javascript/JSEvents.h>
+
+
 #include "AEPlayer.h"
 #include "AEEvents.h"
 #include "AEEditor.h"

Source/AtomicEditor/Source/UI/UIConsoleWidget.cpp

@@ -15,10 +15,10 @@
 #include "UIMainFrame.h"
 #include "UIResourceFrame.h"
 
-#include <Atomic/Javascript/JSEvents.h>
-
 #include <Atomic/IO/FileSystem.h>
 
+#include <AtomicJS/Javascript/JSEvents.h>
+
 #include "../AEJavascript.h"
 #include "../AEEvents.h"
 

Source/AtomicEditor/Source/UI/UIResourceFrame.cpp

@@ -11,7 +11,7 @@
 #include <Atomic/IO/FileSystem.h>
 #include <Atomic/Resource/ResourceCache.h>
 #include <Atomic/Core/CoreEvents.h>
-#include <Atomic/Javascript/JSEvents.h>
+#include <AtomicJS/Javascript/JSEvents.h>
 
 #include "UIResourceFrame.h"
 

Source/AtomicJS/CMakeLists.txt

@@ -0,0 +1,60 @@
+
+if (MSVC)
+    set (JAVASCRIPT_BINDINGS_PLATFORM "WINDOWS")
+elseif(APPLE)
+    if (NOT IOS)
+      set (JAVASCRIPT_BINDINGS_PLATFORM "MACOSX")
+    else()
+      set (JAVASCRIPT_BINDINGS_PLATFORM "IOS")
+    endif()
+elseif(ANDROID)
+    set (JAVASCRIPT_BINDINGS_PLATFORM "ANDROID")
+elseif (EMSCRIPTEN)
+  set (JAVASCRIPT_BINDINGS_PLATFORM "WEB")
+endif()
+
+if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
+    add_subdirectory(JSBind)
+endif()
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${CMAKE_SOURCE_DIR}/Source/ThirdParty
+                    ${CMAKE_SOURCE_DIR}/Source/ThirdParty/rapidjson/include
+                    ${CMAKE_SOURCE_DIR}/Source/ThirdParty/kNet/include
+                    ${CMAKE_SOURCE_DIR}/Source/ThirdParty/FreeType/include
+                    ${CMAKE_SOURCE_DIR}/Source/ThirdParty/Box2D)
+
+file (GLOB JAVASCRIPT_SOURCE Javascript/*.cpp Javascript/*.h)
+
+if (NOT MSVC)
+    # for kNet
+    add_definitions (-DUNIX)
+endif()
+
+# Create the JSBind files ahead of time, so they are picked up with glob
+set (JSFILES JSModuleAtomic2D.cpp;JSModuleAudio.cpp;JSModuleContainer.cpp;JSModuleCore.cpp;
+             JSModuleEngine.cpp;JSModuleEnvironment.cpp;JSModuleGraphics.cpp;JSModuleInput.cpp;
+             JSModuleIO.cpp;JSModuleJavascript.cpp;JSModuleMath.cpp;JSModuleNavigation.cpp;
+             JSModuleNetwork.cpp;JSModulePhysics.cpp;JSModuleResource.cpp;JSModules.cpp;
+             JSModuleScene.cpp;JSModuleUI.cpp)
+
+foreach(JSFILE ${JSFILES})
+
+  set (JSFILEPATH "${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Modules/${JSFILE}")
+
+  if (NOT EXISTS ${JSFILEPATH})
+    file(WRITE "${JSFILEPATH}" "// will be created by JSBind")
+  endif()
+
+endforeach()
+
+
+file (GLOB JAVASCRIPT_BINDINGS_SOURCE ${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Modules/*.cpp)
+
+set (SOURCE_FILES ${JAVASCRIPT_SOURCE} ${JAVASCRIPT_BINDINGS_SOURCE} )
+
+add_library(AtomicJS ${SOURCE_FILES})
+
+if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
+    add_dependencies(AtomicJS JSBind)
+endif()

Source/Tools/JSBind/CMakeLists.txt → Source/AtomicJS/JSBind/CMakeLists.txt

@@ -1,3 +1,4 @@
+project (JSBind)
 
 include_directories(${CMAKE_SOURCE_DIR}/Source)
 
@@ -9,3 +10,8 @@ file (GLOB SOURCE_FILES *.cpp cplusplus/*.cpp *.h cplusplus/*.h )
 add_executable(JSBind ${SOURCE_FILES})
 
 target_link_libraries(JSBind ${ATOMIC_LINK_LIBRARIES})
+
+#TODO: finer grained dependencies
+add_custom_command(TARGET JSBind POST_BUILD
+                   COMMAND $<TARGET_FILE:JSBind> "\"${CMAKE_SOURCE_DIR}\"" "${JAVASCRIPT_BINDINGS_PLATFORM}"
+                   COMMENT "Generating Javascript Bindings")

Source/Tools/JSBind/JSBModule.cpp → Source/AtomicJS/JSBind/JSBModule.cpp

@@ -184,19 +184,19 @@ void JSBModule::WriteIncludes(String& source)
 
 		String headerfile = GetFileNameAndExtension(header->filepath_);
 
-#ifdef WIN32
-        headerPath.Replace(JSBind::ROOT_FOLDER + "/Source/Atomic/", "");
-#else
-        headerPath.Replace(JSBind::ROOT_FOLDER + "/Source/Atomic/", "");
-#endif        
-        source.AppendWithFormat("#include \"%s%s\"\n", headerPath.CString(), headerfile.CString());
+        headerPath.Replace(JSBind::ROOT_FOLDER + "/Source/Atomic/", "Atomic/");
+
+        source.AppendWithFormat("#include <%s%s>\n", headerPath.CString(), headerfile.CString());
 
         included.Push(header);
     }
 
     for (unsigned i = 0; i < includes_.Size(); i++)
     {
-        source.AppendWithFormat("#include \"%s\"\n", includes_[i].CString());
+        if (includes_[i].StartsWith("<"))
+            source.AppendWithFormat("#include %s\n", includes_[i].CString());
+        else
+            source.AppendWithFormat("#include \"%s\"\n", includes_[i].CString());
     }
 }
 
@@ -206,10 +206,9 @@ void JSBModule::EmitSource(const String& filepath)
     file.Open(filepath, FILE_WRITE);
 
     source_ = "// This file was autogenerated by JSBind, changes will be lost\n";
-	source_ += "#include \"Precompiled.h\"\n";
     source_ += "#include <Duktape/duktape.h>\n";    
-    source_ += "#include \"Javascript/JSVM.h\"\n";
-    source_ += "#include \"Javascript/JSAPI.h\"\n";
+    source_ += "#include <AtomicJS/Javascript/JSVM.h>\n";
+    source_ += "#include <AtomicJS/Javascript/JSAPI.h>\n";
 
     WriteIncludes(source_);
 
@@ -366,11 +365,17 @@ void JSBModule::Load(const String &moduleJSONFilename)
     {
         String sourceFolder = sources.GetString(j);
         Vector<String> fileNames;
-        JSBind::fileSystem_->ScanDir(fileNames, JSBind::ROOT_FOLDER + "/Source/Atomic/" + sourceFolder, "*.h", SCAN_FILES, false);        
+
+        String sourceRoot = "Atomic";
+
+        if (sourceFolder == "Javascript")
+            sourceRoot = "AtomicJS";
+
+        JSBind::fileSystem_->ScanDir(fileNames, JSBind::ROOT_FOLDER + "/Source/" + sourceRoot + "/" + sourceFolder, "*.h", SCAN_FILES, false);
         for (unsigned k = 0; k < fileNames.Size(); k++)
         {
             // TODO: filter
-            String filepath = JSBind::ROOT_FOLDER + "/Source/Atomic/" + sourceFolder + "/" + fileNames[k];
+            String filepath = JSBind::ROOT_FOLDER + "/Source/" + sourceRoot + "/" + sourceFolder + "/" + fileNames[k];
 
             this->headerFiles_.Push(filepath);
         }

Source/Tools/JSBind/JSBind.cpp → Source/AtomicJS/JSBind/JSBind.cpp

@@ -43,7 +43,7 @@ void Run(const Vector<String>& arguments)
     JSBind::ROOT_FOLDER = arguments[0];
     JSBind::PLATFORM = arguments[1];
 
-    if (!JSBind::fileSystem_->DirExists(JSBind::ROOT_FOLDER + "/Source/Tools/JSBind"))
+    if (!JSBind::fileSystem_->DirExists(JSBind::ROOT_FOLDER + "/Source/AtomicJS/JSBind"))
     {
         ErrorExit("The given Atomic Runtime source tree is invalid");
     }
@@ -56,7 +56,7 @@ void Run(const Vector<String>& arguments)
     JSBind::engine_->Initialize(engineParameters);
 
     ResourceCache* cache = JSBind::context_->GetSubsystem<ResourceCache>();
-    cache->AddResourceDir(JSBind::ROOT_FOLDER + "/Source/Tools/JSBind");
+    cache->AddResourceDir(JSBind::ROOT_FOLDER + "/Source/AtomicJS/JSBind");
 
     JSBindings* bindings = new JSBindings();
     bindings->Initialize();

Source/Tools/JSBind/JSBindings.cpp → Source/AtomicJS/JSBind/JSBindings.cpp

@@ -69,10 +69,9 @@ void JSBindings::EmitJSModules(const String& rootpath)
     file.Open(rootpath + "/JSModules.cpp", FILE_WRITE);
 
     String source = "// This file was autogenerated by JSBind, changes will be lost\n\n";
-	source += "#include \"Precompiled.h\"\n";
     source += "#include <Duktape/duktape.h>\n";    
-    source += "#include \"Javascript/JSVM.h\"\n";
-    source += "#include \"Javascript/JSAPI.h\"\n";
+    source += "#include <AtomicJS/Javascript/JSVM.h>\n";
+    source += "#include <AtomicJS/Javascript/JSAPI.h>\n";
 
     source += "\n\nnamespace Atomic\n{\n";