Josh Engebretson 10 lat temu
rodzic
commit
c56a399e96

+ 2 - 1
Rakefile

@@ -406,6 +406,7 @@ namespace :package do
     DEPLOYMENT_FOLDER = "#{EDITOR_APP_FOLDER_DST}/Deployment"
     FileUtils.cp_r("#{MAC_ARTIFACTS_SRC}/Deployment/Android", "#{EDITOR_APP_FOLDER_DST}/Deployment/Android")
     FileUtils.cp_r("#{MAC_ARTIFACTS_SRC}/Deployment/MacOS", "#{EDITOR_APP_FOLDER_DST}/Deployment/MacOS")
+    FileUtils.cp_r("#{MAC_ARTIFACTS_SRC}/Deployment/Web", "#{EDITOR_APP_FOLDER_DST}/Deployment/Web")
 
     FileUtils.cp_r("#{MAC_ARTIFACTS_SRC}/Docs", "#{EDITOR_APP_FOLDER_DST}/Docs")
     FileUtils.cp_r("#{MAC_ARTIFACTS_SRC}/Examples", "#{EDITOR_APP_FOLDER_DST}/Examples")
@@ -467,7 +468,7 @@ namespace :windows do
 
     Dir.chdir(CMAKE_WINDOWS_BUILD_FOLDER) do
       sh "jom -j4 JSBind"
-      sh "./Source/Tools/JSBind/JSBind.exe #{$RAKE_ROOT}"
+      sh "./Source/Tools/JSBind/JSBind.exe #{$RAKE_ROOT} WINDOWS"
     end
 
 	end

+ 1 - 0
Source/Atomic/CMakeLists.txt

@@ -26,6 +26,7 @@ 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()
 

+ 6 - 1
Source/AtomicEditor/Source/UI/Modal/UIBuildSettingsIOS.cpp

@@ -112,6 +112,11 @@ void UIBuildSettingsIOS::Refresh()
 
 bool UIBuildSettingsIOS::ParseProvisionData(const String& provisionFile)
 {
+#ifdef ATOMIC_PLATFORM_WINDOWS
+
+    return false;
+
+#else    
     String pdata = GetMobileProvisionData(provisionFile.CString());
 
     if (!pdata.Length())
@@ -159,7 +164,7 @@ bool UIBuildSettingsIOS::ParseProvisionData(const String& provisionFile)
     provisionPath_->SetText(provisionFile.CString());
 
     return true;
-
+#endif
 
 }