Building New UI for Emscripten build

CMake/Modules/AtomicDesktop.cmake

@@ -3,4 +3,4 @@ include_directories(${CMAKE_SOURCE_DIR}/Source/ThirdParty/Poco/Foundation/includ
 
 add_definitions( -DATOMIC_TBUI -DATOMIC_FILEWATCHER -DPOCO_NO_AUTOMATIC_LIBS)
 
-set (ATOMIC_LINK_LIBRARIES ${ATOMIC_LINK_LIBRARIES} LibCpuId SQLite TurboBadger)
+set (ATOMIC_LINK_LIBRARIES ${ATOMIC_LINK_LIBRARIES} LibCpuId SQLite)

CMake/Modules/AtomicWeb.cmake

@@ -1,5 +1,7 @@
 
 add_definitions(-DATOMIC_PLATFORM_WEB)
-add_definitions(-DATOMIC_OPENGL -Wno-warn-absolute-paths)
+add_definitions(-DATOMIC_OPENGL -Wno-warn-absolute-paths -DATOMIC_TBUI)
 
-list (APPEND ATOMIC_LINK_LIBRARIES)
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++0x")
+
+set (ATOMIC_LINK_LIBRARIES ${ATOMIC_LINK_LIBRARIES})

CMakeLists.txt

@@ -12,7 +12,7 @@ add_definitions( -DATOMIC_DEV_BUILD )
 # 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)
 
-set (ATOMIC_LINK_LIBRARIES Atomic Box2D Duktape FreeType JO LZ4 PugiXml STB)
+set (ATOMIC_LINK_LIBRARIES Atomic Box2D Duktape TurboBadger FreeType JO LZ4 PugiXml STB)
 
 if (NOT ATOMIC_BUILD_2D)
     add_definitions( -DATOMIC_PHYSICS -DATOMIC_3D)

Source/Atomic/CMakeLists.txt

@@ -15,7 +15,10 @@ file (GLOB IO_SOURCE IO/*.cpp IO/*.h)
 file (GLOB RESOURCE_SOURCE Resource/*.cpp Resource/*.h)
 file (GLOB AUDIO_SOURCE Audio/*.cpp Audio/*.h)
 file (GLOB NETWORK_SOURCE Network/*.cpp Network/*.h)
-file (GLOB IPC_SOURCE IPC/*.cpp IPC/*.h)
+
+if (NOT EMSCRIPTEN)
+  file (GLOB IPC_SOURCE IPC/*.cpp IPC/*.h)
+endif()  
 
 file (GLOB ATOMIC2D_SOURCE Atomic2D/*.cpp Atomic2D/*.h)
 file (GLOB SCENE_SOURCE Scene/*.cpp Scene/*.h)
@@ -40,13 +43,13 @@ else()
 endif()
 
 if (ANDROID)
-  
+
 endif()
 
 if (APPLE)
-    if (NOT IOS)      
+    if (NOT IOS)
       set (PLATFORM_SOURCE IO/MacFileWatcher.mm)
-    else()      
+    else()
     endif()
 endif()
 
@@ -55,7 +58,7 @@ if (EMSCRIPTEN)
 endif()
 
 set (SOURCE_FILES ${CONTAINER_SOURCE} ${CORE_SOURCE} ${ENGINE_SOURCE} ${INPUT_SOURCE}
-                  ${AUDIO_SOURCE} ${IO_SOURCE} ${MATH_SOURCE} 
+                  ${AUDIO_SOURCE} ${IO_SOURCE} ${MATH_SOURCE}
                   ${RESOURCE_SOURCE} ${PHYSICS_SOURCE} ${IPC_SOURCE}
                   ${GRAPHICS_SOURCE} ${GRAPHICS_IMPL_SOURCE}
                   ${ATOMIC3D_SOURCE}
@@ -68,4 +71,3 @@ if (NOT EMSCRIPTEN)
 endif()
 
 add_library(Atomic ${SOURCE_FILES})
-

Source/AtomicPlayer/CMakeLists.txt

@@ -13,7 +13,7 @@ elseif(APPLE)
     set(MACOSX_BUNDLE_ICON_FILE Atomic.icns)
     set(ATOMIC_EDITOR_ICON ${CMAKE_SOURCE_DIR}/CMake/Modules/Atomic.icns)
     set_source_files_properties(${ATOMIC_EDITOR_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
-    set (EXE_TYPE MACOSX_BUNDLE)    
+    set (EXE_TYPE MACOSX_BUNDLE)
 endif()
 
 if (ANDROID)
@@ -51,4 +51,3 @@ endif(APPLE)
 if (TARGET_PROPERTIES)
     set_target_properties (AtomicPlayer PROPERTIES ${TARGET_PROPERTIES})
 endif ()
-

Source/ThirdParty/CMakeLists.txt

@@ -6,6 +6,7 @@ add_subdirectory(JO)
 add_subdirectory(LZ4)
 add_subdirectory(PugiXml)
 add_subdirectory(STB)
+add_subdirectory(TurboBadger)
 
 if (NOT ATOMIC_BUILD_2D)
 	add_subdirectory(Bullet)
@@ -23,7 +24,6 @@ endif()
 if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
     add_subdirectory(LibCpuId)
     add_subdirectory(SQLite)
-    add_subdirectory(TurboBadger)
     add_subdirectory(Poco)
     add_subdirectory(nativefiledialog)
 endif ()

Source/ThirdParty/TurboBadger/tb_config.h

@@ -109,6 +109,13 @@
 #define TB_CLIPBOARD_DUMMY
 #endif
 
+#ifdef EMSCRIPTEN
+#define TB_FILE_POSIX
+#define TB_TARGET_EMSCRIPTEN
+#define TB_SYSTEM_LINUX
+#define TB_CLIPBOARD_DUMMY
+#endif
+
 #ifdef MACOSX
 #define TB_FILE_POSIX
 #define TB_TARGET_MACOSX