Browse Source

Fixing WebGL build

Josh Engebretson 10 years ago
parent
commit
df25dd901f
2 changed files with 9 additions and 7 deletions
  1. 7 7
      Rakefile
  2. 2 0
      Source/Atomic/Graphics/DebugRenderer.cpp

+ 7 - 7
Rakefile

@@ -105,7 +105,7 @@ namespace :build  do
       end
 
       Dir.chdir(CMAKE_IOS_BUILD_FOLDER) do
-        sh "#{ATOMICTOOL_BIN_MACOSX} bind #{$RAKE_ROOT} Source/AtomicJS/Packages/Atomic/ IOS"
+        sh "#{ATOMICTOOL_BIN_MACOSX} bind #{$RAKE_ROOT} Script/Packages/Atomic/ IOS"
         sh "cmake -DIOS=1 -DCMAKE_BUILD_TYPE=Release -G Xcode ../../"
         # the -s option adds $KEYCHAIN to the search scope, while the -d option adds $KEYCHAIN to the system domain; both are needed
         sh "security -v list-keychains -d system -s /Users/jenkins/Library/Keychains/codesign.keychain"
@@ -123,7 +123,7 @@ namespace :build  do
 
       Dir.chdir(CMAKE_ANDROID_BUILD_FOLDER) do
 
-        sh "#{ATOMICTOOL_BIN_MACOSX} bind #{$RAKE_ROOT} Source/AtomicJS/Packages/Atomic/ ANDROID"
+        sh "#{ATOMICTOOL_BIN_MACOSX} bind #{$RAKE_ROOT} Script/Packages/Atomic/ ANDROID"
         sh "cmake -DCMAKE_TOOLCHAIN_FILE=#{$RAKE_ROOT}/CMake/Toolchains/android.toolchain.cmake -DCMAKE_BUILD_TYPE=Release ../../"
         sh "make -j4"
       end
@@ -137,15 +137,15 @@ namespace :build  do
       end
 
       Dir.chdir(CMAKE_WEB_BUILD_FOLDER) do
-        sh "#{ATOMICTOOL_BIN_MACOSX} bind #{$RAKE_ROOT} Source/AtomicJS/Packages/Atomic/ WEB"
+        sh "#{ATOMICTOOL_BIN_MACOSX} bind #{$RAKE_ROOT} Script/Packages/Atomic/ WEB"
         sh "cmake -DEMSCRIPTEN=1 -DATOMIC_BUILD_2D=1 -DCMAKE_TOOLCHAIN_FILE=#{$RAKE_ROOT}/CMake/Toolchains/emscripten.toolchain.cmake -DCMAKE_BUILD_TYPE=Release ../../"
         sh "make -j4"
       end
 
-      Dir.chdir("#{CMAKE_WEB_BUILD_FOLDER}/Source/AtomicPlayer") do
-        sh "mv AtomicPlayer AtomicPlayer.bc"
-        sh "emcc -O3 -s ASM_JS=1 -s VERBOSE=0 -s USE_SDL=2 -s TOTAL_MEMORY=134217728 -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s NO_EXIT_RUNTIME=1 ./AtomicPlayer.bc -o  ./AtomicPlayer.html"
-      end
+      #Dir.chdir("#{CMAKE_WEB_BUILD_FOLDER}/Source/AtomicPlayer") do
+      #  sh "mv AtomicPlayer AtomicPlayer.bc"
+      #  sh "emcc -O3 -s ASM_JS=1 -s VERBOSE=0 -s USE_SDL=2 -s TOTAL_MEMORY=134217728 -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s NO_EXIT_RUNTIME=1 ./AtomicPlayer.bc -o  ./AtomicPlayer.html"
+      #end
 
   end
 

+ 2 - 0
Source/Atomic/Graphics/DebugRenderer.cpp

@@ -38,6 +38,8 @@
 
 #ifdef ATOMIC_3D
 #include "../Atomic3D/AnimatedModel.h"
+#else
+#include "../Scene/Node.h"
 #endif
 namespace Atomic
 {