Web updates

CMakeLists.txt

@@ -7,18 +7,11 @@ set (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
 
 add_definitions( -DATOMIC_STATIC_DEFINE -DATOMIC_LOGGING -DATOMIC_PHYSICS -DATOMIC_ATOMIC2D )
 
-if (NOT EMSCRIPTEN)
-	
-	add_definitions( -DATOMIC_NETWORK )
-
-endif()
-
 set (ATOMIC_LINK_LIBRARIES Atomic Box2D Bullet Duktape FreeType JO LZ4 PugiXml StanHull STB )
 
 if (NOT EMSCRIPTEN)
-
-	set (ATOMIC_LINK_LIBRARIES ${ATOMIC_LINK_LIBRARIES} SDL Civetweb Recast Detour kNet )
-
+    add_definitions( -DATOMIC_NETWORK )
+    set (ATOMIC_LINK_LIBRARIES ${ATOMIC_LINK_LIBRARIES} SDL Civetweb Recast Detour kNet )
 endif()
 
 if (MSVC)

Source/Atomic/CMakeLists.txt

@@ -47,7 +47,7 @@ set (SOURCE_FILES ${CONTAINER_SOURCE} ${CORE_SOURCE} ${ENGINE_SOURCE} ${INPUT_SO
                   ${PLATFORM_SOURCE})
 
 if (NOT EMSCRIPTEN)
-  set (SOURCE_FILES ${SOURCEFILES} ${NETWORK_SOURCE} ${NAVIGATION_SOURCE})
+  set (SOURCE_FILES ${SOURCE_FILES} ${NETWORK_SOURCE} ${NAVIGATION_SOURCE})
 endif()
 
 add_library(Atomic ${SOURCE_FILES})

Source/Tools/AtomicPlayer/AtomicPlayer.cpp

@@ -79,11 +79,15 @@ int main(int argc, char** argv)
 
     EmscriptenApp::sInstance_->application_->Run();
 
+    emscripten_set_main_loop(RunFrame, 0, 1);
+
+/*
     int firefox = EM_ASM_INT ( return ((navigator.userAgent.toLowerCase().indexOf('firefox') > -1) ? 1 : 0), 0);
     if (firefox)
         emscripten_set_main_loop(RunFrame, 0, 1);
     else
         emscripten_set_main_loop(RunFrame, 60, 1);
+*/        
     return 0;
 }
 
@@ -133,8 +137,6 @@ void AtomicPlayer::Setup()
 #if (ATOMIC_PLATFORM_ANDROID)
     engineParameters_["FullScreen"] = true;
     engineParameters_["ResourcePaths"] = "CoreData;Data;AtomicResources";
-#elif ATOMIC_PLATFORM_WEB
-    engineParameters_["ResourcePaths"] = "CoreData;Data;AtomicResources";
 #else
     engineParameters_["ResourcePaths"] = "AtomicResources";
     engineParameters_["FullScreen"] = false;