Create symbolic link in app bundle for build

Source/AtomicEditor/AtomicEditorMac.cmake

@@ -0,0 +1,6 @@
+
+add_custom_command(TARGET AtomicEditor POST_BUILD
+                   COMMAND ln -sfh "${CMAKE_SOURCE_DIR}/Data/AtomicEditor/Resources/EditorData" "$<TARGET_FILE_DIR:AtomicEditor>/../Resources/EditorData"
+                   COMMAND ln -sfh "${CMAKE_SOURCE_DIR}/Data/AtomicPlayer/Resources/CoreData" "$<TARGET_FILE_DIR:AtomicEditor>/../Resources/CoreData" )
+
+

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)
@@ -33,16 +31,17 @@ add_executable(AtomicEditor ${EXE_TYPE} ${SOURCE_FILES} ${ATOMIC_EDITOR_ICON})
 
 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)
     set_target_properties (AtomicEditor PROPERTIES ${TARGET_PROPERTIES})
 endif ()
+
+if (APPLE)
+    include(AtomicEditorMac.cmake)
+endif(APPLE)

Source/AtomicJS/CMakeLists.txt

@@ -12,7 +12,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
 
 file (GLOB JAVASCRIPT_SOURCE Javascript/*.cpp Javascript/*.h)
 
-
 if (MSVC)
     set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "WINDOWS")  
 else()
@@ -38,7 +37,6 @@ 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)
 
 set (SOURCE_FILES ${JAVASCRIPT_SOURCE} ${JAVASCRIPT_BINDINGS_SOURCE} )

Source/AtomicJS/JSBind/JSBModule.cpp

@@ -368,11 +368,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);
         }