Merge pull request #1559 from AtomicGameEngine/ATOMIC-JME-SHAREDLIB

[C++] Atomic shared library support

Build/CMake/Modules/AtomicCommon.cmake

@@ -22,17 +22,18 @@
 
 include(CMakeParseArguments)
 
-if ($ENV{ATOMIC_BUILD_DIST})
-    add_definitions(-DATOMIC_BUILD_DIST=1)
-endif ()
-
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DATOMIC_DEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DATOMIC_DEBUG")
 if (CMAKE_SIZEOF_VOID_P MATCHES 8)
     set(ATOMIC_PROJECT_ARCH "x86_64")
+    set(ATOMIC_PROJECT_ARCH_SHORT "x64")
+    set(ATOMIC_PROJECT_ARCH_BITS "64")
     set(ATOMIC_64BIT 1)
 else ()
     set(ATOMIC_PROJECT_ARCH "x86")
+    set(ATOMIC_PROJECT_ARCH_SHORT "x86")
+    set(ATOMIC_PROJECT_ARCH_BITS "32")
+    set(ATOMIC_64BIT 0)
 endif ()
 
 # Macro for defining source files with optional arguments as follows:
@@ -189,3 +190,36 @@ macro(setup_executable)
 
     setup_target()
 endmacro()
+
+# Macro for replacing substrings in every variable specified in the list.
+# Macro arguments:
+#  substring - a value that is to be replaced.
+#  replacement - a new value that will replace `substring`.
+#  variable_list - a list of variables. If list is specified manually enclose it in quotes and separate items with semicolon.
+macro(replace_in_list substring replacement variable_list)
+    foreach (single_variable ${variable_list})
+        string(REPLACE "${substring}" "${replacement}" ${single_variable} "${${single_variable}}")
+    endforeach ()
+endmacro()
+
+# Macro for setting msvc runtime flags globally.
+# Macro arguments:
+#  runtime_flag - release build runtime flag, /MT or /MD. Debug flag will be deduced automatically by appending 'd'.
+macro(msvc_set_runtime runtime_flag)
+    set(COMPILER_DEBUG_VARS "CMAKE_C_FLAGS_DEBUG;CMAKE_CXX_FLAGS_DEBUG")
+    set(COMPILER_RELEASE_VARS "CMAKE_C_FLAGS_RELEASE;CMAKE_C_FLAGS_RELWITHDEBINFO;CMAKE_C_FLAGS_MINSIZEREL;CMAKE_CXX_FLAGS_RELEASE;CMAKE_CXX_FLAGS_RELWITHDEBINFO;CMAKE_CXX_FLAGS_MINSIZEREL")
+    set(COMPILER_COMMON_VARS "CMAKE_C_FLAGS;CMAKE_CXX_FLAGS")
+    set(COMPILER_RUNTIME_FLAGS "/MDd;/MD;/MTd;/MT")
+    # Clear old runtime flags.
+    foreach(flag ${COMPILER_RUNTIME_FLAGS})
+        replace_in_list(${flag} "" "${COMPILER_DEBUG_VARS};${COMPILER_RELEASE_VARS};${COMPILER_COMMON_VARS}")
+    endforeach()
+    # Add release runtime flags.
+    foreach(var ${COMPILER_RELEASE_VARS})
+        set(${var} "${${var}} ${runtime_flag}")
+    endforeach()
+    # Add debug runtime flags.
+    foreach(var ${COMPILER_DEBUG_VARS})
+        set(${var} "${${var}} ${runtime_flag}d")
+    endforeach()
+endmacro()

Build/CMake/Modules/AtomicIOS.cmake

@@ -2,7 +2,7 @@ include(BundleUtilities)
 
 set(JAVASCRIPT_BINDINGS_PLATFORM "IOS")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof")
 
 set(CMAKE_CROSSCOMPILING TRUE)
 set(CMAKE_XCODE_EFFECTIVE_PLATFORMS -iphoneos -iphonesimulator)

Build/CMake/Modules/AtomicLinux.cmake

@@ -3,8 +3,13 @@ set(ATOMIC_NODE_JAKE Build/Linux/node/node Build/node_modules/jake/bin/cli.js -f
 
 include(AtomicDesktop)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-warn-absolute-paths -fPIC")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-warn-absolute-paths -Wno-invalid-offsetof -std=gnu++0x -fPIC")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -fPIC")
+
+if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-warn-absolute-paths")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-warn-absolute-paths")
+endif()
 
 find_package(PkgConfig REQUIRED)
 # for native file dialog

Build/CMake/Modules/AtomicMac.cmake

@@ -19,5 +19,5 @@ else ()
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -no_deduplicate")
 endif ()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++11 -stdlib=libc++")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -stdlib=libc++")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -framework AudioToolbox -framework Carbon -framework Cocoa -framework CoreAudio -framework CoreVideo -framework ForceFeedback -framework IOKit -framework OpenGL -framework CoreServices -framework Security")

Build/CMake/Modules/AtomicPlatform.cmake

@@ -1,4 +1,6 @@
 
+set(ATOMIC_DYNAMIC_RUNTIME OFF CACHE BOOL "Build engine as shared library and link dynamically to system runtime.")
+
 if (WIN32)
     include(AtomicWindows)
 elseif (APPLE)

Build/CMake/Modules/AtomicWindows.cmake

@@ -7,21 +7,16 @@ include(AtomicDesktop)
 
 set(ATOMIC_NODE_JAKE Build/Windows/node/node.exe Build/node_modules/jake/bin/cli.js -f Build\\Scripts\\Bootstrap.js)
 
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(D3DCOMPILER_47_DLL ${ATOMIC_SOURCE_DIR}/Build/Windows/Binaries/x64/D3DCompiler_47.dll)
-else ()
-    set(D3DCOMPILER_47_DLL ${ATOMIC_SOURCE_DIR}/Build/Windows/Binaries/x86/D3DCompiler_47.dll)
-endif ()
+set(D3DCOMPILER_47_DLL ${ATOMIC_SOURCE_DIR}/Build/Windows/Binaries/${ATOMIC_PROJECT_ARCH_SHORT}/D3DCompiler_47.dll)
 
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 
-
 # compile with static runtime
-set(CompilerFlags
-    CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO
-    CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
-    CMAKE_C_FLAGS_MINSIZEREL)
-
-foreach (CompilerFlag ${CompilerFlags})
-    string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
-endforeach ()
+if (MSVC)
+    if (ATOMIC_DYNAMIC_RUNTIME)
+        set(ATOMIC_MSVC_RUNTIME /MD)
+    else ()
+        set(ATOMIC_MSVC_RUNTIME /MT)
+    endif ()
+    msvc_set_runtime(${ATOMIC_MSVC_RUNTIME})
+endif ()

Source/Atomic/BuildInfo/AtomicBuildInfo.h

@@ -29,7 +29,7 @@
 namespace Atomic
 {
 
-class AtomicBuildInfo : public RefCounted
+class ATOMIC_API AtomicBuildInfo : public RefCounted
 {
     ATOMIC_REFCOUNTED(AtomicBuildInfo)
 

Source/Atomic/CMakeLists.txt

@@ -92,7 +92,17 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/BuildInfo/AtomicGitSHA.cpp.in" "${CM
 
 set (SOURCE_FILES ${SOURCE_FILES} BuildInfo/AtomicBuildInfo.cpp BuildInfo/AtomicBuildInfo.h BuildInfo/AtomicGitSHA.cpp BuildInfo/AtomicGitSHA.h)
 
-add_library(Atomic ${SOURCE_FILES})
+if (ATOMIC_DYNAMIC_RUNTIME)
+    set(ATOMIC_LIBRARY_TYPE SHARED)
+else ()
+    set(ATOMIC_LIBRARY_TYPE STATIC)
+endif ()
+add_library(Atomic ${ATOMIC_LIBRARY_TYPE} ${SOURCE_FILES})
+if (NOT ATOMIC_DYNAMIC_RUNTIME)
+    target_compile_definitions (Atomic PUBLIC -DATOMIC_STATIC_DEFINE=1 -DATOMIC_API=)
+else ()
+    target_compile_definitions (Atomic PRIVATE -DATOMIC_EXPORTS=1)
+endif ()
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(Atomic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../)
@@ -202,7 +212,6 @@ else ()
 endif ()
 
 # TODO: enable shared library builds.
-target_compile_definitions (Atomic PUBLIC -DATOMIC_STATIC_DEFINE=1 -DATOMIC_API=)
 if (NOT APPLE OR IOS OR WEB)
     target_compile_definitions (Atomic PUBLIC -DATOMIC_TBUI=1)
 endif ()
@@ -226,3 +235,18 @@ target_include_directories (Atomic PUBLIC
 )
 
 include(AtomicDoc)
+
+if ($ENV{ATOMIC_BUILD_DIST})
+    target_compile_definitions(Atomic PUBLIC -DATOMIC_BUILD_DIST=1)
+endif ()
+
+if (MSVC)
+    target_compile_options(Atomic PUBLIC "$<$<CONFIG:Debug>:${ATOMIC_MSVC_RUNTIME}d>")
+    target_compile_options(Atomic PUBLIC "$<$<CONFIG:Release>:${ATOMIC_MSVC_RUNTIME}>")
+    target_compile_options(Atomic PUBLIC "$<$<CONFIG:RelWithDebInfo>:${ATOMIC_MSVC_RUNTIME}>")
+    target_compile_options(Atomic PUBLIC "$<$<CONFIG:MinSizeRel>:${ATOMIC_MSVC_RUNTIME}>")
+endif ()
+
+if (UNIX OR MINGW)
+    target_compile_options(Atomic PUBLIC -std=gnu++11)
+endif ()

Source/Atomic/Engine/EngineConfig.h

@@ -32,8 +32,7 @@ namespace Atomic
 class Context;
 
 /// Atomic engine configuration
-class EngineConfig :
-    Configuration
+class ATOMIC_API EngineConfig : Configuration
 {
 
 public:

Source/Atomic/Environment/Environment.h

@@ -27,6 +27,6 @@
 namespace Atomic
 {
 
-void RegisterEnvironmentLibrary(Context* context);
+void ATOMIC_API RegisterEnvironmentLibrary(Context* context);
 
 }

Source/Atomic/Environment/ProcSky.h

@@ -40,7 +40,7 @@ namespace Atomic
 {
 
 
-class ProcSky : public Drawable
+class ATOMIC_API ProcSky : public Drawable
 {
     ATOMIC_OBJECT(ProcSky, Drawable);
 

Source/Atomic/IPC/IPC.h

@@ -41,7 +41,7 @@ struct QueuedEvent
     VariantMap eventData_;
 };
 
-class IPC : public Object
+class ATOMIC_API IPC : public Object
 {
     ATOMIC_OBJECT(IPC, Object);
 

Source/Atomic/IPC/IPCBroker.h

@@ -31,7 +31,7 @@ class IPCProcess;
 
 
 /// Server application held broker
-class IPCBroker : public IPCChannel
+class ATOMIC_API IPCBroker : public IPCChannel
 {
     friend class IPC;
 

Source/Atomic/IPC/IPCChannel.h

@@ -41,7 +41,7 @@
 namespace Atomic
 {
 
-class IPCChannel : public Object, public Thread
+class ATOMIC_API IPCChannel : public Object, public Thread
 {
     ATOMIC_OBJECT(IPCChannel, Object)
 

Source/Atomic/IPC/IPCMessage.h

@@ -44,7 +44,7 @@ struct IPCMessageHeader
     unsigned messageSize_;
 };
 
-class IPCMessageEvent
+class ATOMIC_API IPCMessageEvent
 {
 
 public:

Source/Atomic/IPC/IPCServer.h

@@ -42,7 +42,7 @@ namespace Atomic
     class IPCBroker;
 
     /// IPCResultHandler
-    class IPCResultHandler : public Object
+    class ATOMIC_API IPCResultHandler : public Object
     {
         ATOMIC_OBJECT(IPCResultHandler, Object)
 
@@ -59,7 +59,7 @@ namespace Atomic
     };
 
     /// IPCServer
-    class IPCServer : public Object
+    class ATOMIC_API IPCServer : public Object
     {
         ATOMIC_OBJECT(IPCServer, Object)
 

Source/Atomic/IPC/IPCUnix.h

@@ -72,7 +72,7 @@ private:
     PODVector<char> buf_;
 };
 
-class IPCProcess : public Object
+class ATOMIC_API IPCProcess : public Object
 {
     ATOMIC_OBJECT(IPCProcess, Object)
 

Source/Atomic/IPC/IPCWindows.h

@@ -112,7 +112,7 @@ private:
     PODVector<char> buf_;
 };
 
-class IPCProcess : public Object
+class ATOMIC_API IPCProcess : public Object
 {
     ATOMIC_OBJECT(IPCProcess, Object)
 

Source/Atomic/IPC/IPCWorker.h

@@ -29,7 +29,7 @@
 namespace Atomic
 {
 
-class IPCWorker : public IPCChannel
+class ATOMIC_API IPCWorker : public IPCChannel
 {
     ATOMIC_OBJECT(IPCWorker, IPCChannel);
 

Source/Atomic/Metrics/Metrics.h

@@ -28,7 +28,7 @@
 namespace Atomic
 {
 
-class MetricsSnapshot : public RefCounted
+class ATOMIC_API MetricsSnapshot : public RefCounted
 {
     friend class Metrics;
 

Source/Atomic/Resource/Configuration.h

@@ -31,7 +31,7 @@ namespace Atomic
 class Context;
 
 /// Configuration base class for mapping JSON setting files to VariantMap configuration settings
-class Configuration
+class ATOMIC_API Configuration
 {
 public:
 

Source/Atomic/Resource/ResourceCache.h

@@ -343,7 +343,7 @@ void ATOMIC_API RegisterResourceLibrary(Context* context);
 
 // ATOMIC BEGIN
 /// Extension used for package files
-extern const char* PAK_EXTENSION;
+extern ATOMIC_API const char* PAK_EXTENSION;
 // ATOMIC END
 
 

Source/Atomic/Scene/PrefabComponent.h

@@ -7,7 +7,7 @@
 namespace Atomic
 {
 
-class PrefabComponent : public Component
+class ATOMIC_API PrefabComponent : public Component
 {
     ATOMIC_OBJECT(PrefabComponent, Component);
 

Source/Atomic/Script/ScriptPhysics.h

@@ -32,7 +32,7 @@ namespace Atomic
 {
     class Node;
 
-    class PhysicsContact : public RefCounted
+    class ATOMIC_API PhysicsContact : public RefCounted
     {
         friend class PhysicsNodeCollision;
 
@@ -64,7 +64,7 @@ namespace Atomic
         float impulse_;
     };
 
-    class PhysicsNodeCollision : public RefCounted
+    class ATOMIC_API PhysicsNodeCollision : public RefCounted
     {
         ATOMIC_REFCOUNTED(PhysicsNodeCollision)
 

Source/Atomic/UI/UI.h

@@ -41,7 +41,7 @@ namespace SystemUI
     class MessageBox;
 }
 
-class UI : public Object, private tb::TBWidgetListener
+class ATOMIC_API UI : public Object, private tb::TBWidgetListener
 {
     ATOMIC_OBJECT(UI, Object)
 

Source/Atomic/UI/UIBargraph.h

@@ -29,7 +29,7 @@
 namespace Atomic
 {
 
-class UIBargraph : public UIWidget
+class ATOMIC_API UIBargraph : public UIWidget
 {
     ATOMIC_OBJECT(UIBargraph, UIWidget)
 

Source/Atomic/UI/UIButton.h

@@ -30,7 +30,7 @@ namespace Atomic
 {
 
 
-class UIButton : public UIWidget
+class ATOMIC_API UIButton : public UIWidget
 {
     ATOMIC_OBJECT(UIButton, UIWidget)
 

Source/Atomic/UI/UICheckBox.h

@@ -28,7 +28,7 @@ namespace Atomic
 {
 
 
-class UICheckBox : public UIWidget
+class ATOMIC_API UICheckBox : public UIWidget
 {
     ATOMIC_OBJECT(UICheckBox, UIWidget)
 

Source/Atomic/UI/UIClickLabel.h

@@ -28,7 +28,7 @@ namespace Atomic
 {
 
 
-class UIClickLabel : public UIWidget
+class ATOMIC_API UIClickLabel : public UIWidget
 {
     ATOMIC_OBJECT(UIClickLabel, UIWidget)
 

Source/Atomic/UI/UIColorWheel.h

@@ -30,7 +30,7 @@ namespace Atomic
 {
 
 
-class UIColorWheel : public UIWidget
+class ATOMIC_API UIColorWheel : public UIWidget
 {
     ATOMIC_OBJECT(UIColorWheel, UIWidget)
 

Source/Atomic/UI/UIColorWidget.h

@@ -31,7 +31,7 @@ namespace Atomic
 
 /// A widget that can render a Texture2D, so the image data
 /// doesn't need to be loaded 2x (once for Texture2D and once for say a UIImageWidget)
-class UIColorWidget : public UIWidget
+class ATOMIC_API UIColorWidget : public UIWidget
 {
     ATOMIC_OBJECT(UIColorWidget, UIWidget)
 

Source/Atomic/UI/UIContainer.h

@@ -27,7 +27,7 @@
 namespace Atomic
 {
 
-class UIContainer : public UIWidget
+class ATOMIC_API UIContainer : public UIWidget
 {
     ATOMIC_OBJECT(UIContainer, UIWidget)
 

Source/Atomic/UI/UIDimmer.h

@@ -27,7 +27,7 @@
 namespace Atomic
 {
 
-class UIDimmer : public UIWidget
+class ATOMIC_API UIDimmer : public UIWidget
 {
     ATOMIC_OBJECT(UIDimmer, UIWidget)
 

Source/Atomic/UI/UIDragDrop.h

@@ -34,7 +34,7 @@ class UITextField;
 class UIDragObject;
 
 /// UIDragDrop subsystem
-class UIDragDrop : public Object
+class ATOMIC_API UIDragDrop : public Object
 {
 
     ATOMIC_OBJECT(UIDragDrop, Object);

Source/Atomic/UI/UIDragObject.h

@@ -28,7 +28,7 @@ namespace Atomic
 {
 
 
-class UIDragObject : public Object
+class ATOMIC_API UIDragObject : public Object
 {
 
     ATOMIC_OBJECT(UIDragObject, Object);

Source/Atomic/UI/UIEditField.h

@@ -39,7 +39,7 @@ enum UI_EDIT_TYPE {
     UI_EDIT_TYPE_NUMBER = 6 // tb::EDIT_TYPE_NUMBER
 };
 
-class UIEditField : public UIWidget
+class ATOMIC_API UIEditField : public UIWidget
 {
     ATOMIC_OBJECT(UIEditField, UIWidget)
 

Source/Atomic/UI/UIFontDescription.h

@@ -27,7 +27,7 @@
 namespace Atomic
 {
 
-class UIFontDescription : public Object
+class ATOMIC_API UIFontDescription : public Object
 {
     ATOMIC_OBJECT(UIFontDescription, Object)
 

Source/Atomic/UI/UIImageWidget.h

@@ -28,7 +28,7 @@ namespace Atomic
 {
 
 
-class UIImageWidget : public UIWidget
+class ATOMIC_API UIImageWidget : public UIWidget
 {
     ATOMIC_OBJECT(UIImageWidget, UIWidget)
 

Source/Atomic/UI/UIInlineSelect.h

@@ -28,7 +28,7 @@ namespace Atomic
 {
 
 
-class UIInlineSelect : public UIWidget
+class ATOMIC_API UIInlineSelect : public UIWidget
 {
     ATOMIC_OBJECT(UIInlineSelect, UIWidget)
 

Source/Atomic/UI/UILayout.h

@@ -86,7 +86,7 @@ enum UI_LAYOUT_DISTRIBUTION_POSITION
 
 
 
-class UILayoutParams : public Object
+class ATOMIC_API UILayoutParams : public Object
 {
     ATOMIC_OBJECT(UILayoutParams, Object)
 
@@ -113,7 +113,7 @@ private:
 };
 
 
-class UILayout : public UIWidget
+class ATOMIC_API UILayout : public UIWidget
 {
     ATOMIC_OBJECT(UILayout, UIWidget)
 

Source/Atomic/UI/UIListView.h

@@ -31,7 +31,7 @@ namespace Atomic
 class ListViewItemSource;
 class ListViewItem;
 
-class UIListView : public UIWidget
+class ATOMIC_API UIListView : public UIWidget
 {
     ATOMIC_OBJECT(UIListView, UIWidget);
 

Source/Atomic/UI/UIMenuWindow.h

@@ -31,7 +31,7 @@ namespace Atomic
 
 class UISelectItemSource;
 
-class UIMenuWindow : public UIWidget
+class ATOMIC_API UIMenuWindow : public UIWidget
 {
     ATOMIC_OBJECT(UIMenuWindow, UIWidget)
 

Source/Atomic/UI/UIMenubar.h

@@ -29,7 +29,7 @@ namespace Atomic
 
 class UIMenuItemSource;
 
-class UIMenuItem : public UISelectItem
+class ATOMIC_API UIMenuItem : public UISelectItem
 {
     ATOMIC_OBJECT(UIMenuItem, UISelectItem)
 

Source/Atomic/UI/UIMessageWindow.h

@@ -37,7 +37,7 @@ enum UI_MESSAGEWINDOW_SETTINGS
 };
 
 
-class UIMessageWindow : public UIWindow
+class ATOMIC_API UIMessageWindow : public UIWindow
 {
     ATOMIC_OBJECT(UIMessageWindow, UIWindow)
 

Source/Atomic/UI/UIPopupWindow.h

@@ -27,7 +27,7 @@
 namespace Atomic
 {
 
-class UIPopupWindow: public UIWidget
+class ATOMIC_API UIPopupWindow: public UIWidget
 {
     ATOMIC_OBJECT(UIPopupWindow, UIWidget)
 

Source/Atomic/UI/UIPreferredSize.h

@@ -45,7 +45,7 @@ enum UI_SIZE_DEP {
     UI_SIZE_DEP_BOTH                    = 3 //  tb::SIZE_DEP_BOTH
 };
 
-class UIPreferredSize : public RefCounted
+class ATOMIC_API UIPreferredSize : public RefCounted
 {
     friend class UIWidget;
 

Source/Atomic/UI/UIRenderer.h

@@ -38,7 +38,7 @@ namespace Atomic
 
 class UI;
 
-class UIRenderer : public tb::TBRendererBatcher
+class ATOMIC_API UIRenderer : public tb::TBRendererBatcher
 {
     friend class UI;
 public:

Source/Atomic/UI/UISceneView.h

@@ -39,7 +39,7 @@ namespace Atomic
 class UISceneView;
 class UIRenderer;
 
-class SceneViewWidget : public tb::TBWidget
+class ATOMIC_API SceneViewWidget : public tb::TBWidget
 {
     friend class UISceneView;
 
@@ -59,7 +59,7 @@ private:
 };
 
 
-class UISceneView : public UIWidget
+class ATOMIC_API UISceneView : public UIWidget
 {
 
     friend class SceneViewWidget;

Source/Atomic/UI/UIScrollContainer.h

@@ -43,7 +43,7 @@ enum UI_SCROLL_MODE {
 };
 
 
-class UIScrollContainer : public UIWidget
+class ATOMIC_API UIScrollContainer : public UIWidget
 {
     ATOMIC_OBJECT(UIScrollContainer, UIWidget)
 

Source/Atomic/UI/UISection.h

@@ -28,7 +28,7 @@ namespace Atomic
 {
 
 
-class UISection : public UIWidget
+class ATOMIC_API UISection : public UIWidget
 {
     ATOMIC_OBJECT(UISection, UIWidget)
 

Source/Atomic/UI/UISelectDropdown.h

@@ -28,7 +28,7 @@
 namespace Atomic
 {
 
-class UISelectDropdown : public UIButton
+class ATOMIC_API UISelectDropdown : public UIButton
 {
     ATOMIC_OBJECT(UISelectDropdown, UIButton)
 

Source/Atomic/UI/UISelectItem.h

@@ -33,7 +33,7 @@ namespace Atomic
 
 class UISelectItemSource;
 
-class UISelectItem : public Object
+class ATOMIC_API UISelectItem : public Object
 {
     ATOMIC_OBJECT(UISelectItem, Object)
 
@@ -64,7 +64,7 @@ protected:
 
 };
 
-class UISelectItemSource : public Object
+class ATOMIC_API UISelectItemSource : public Object
 {
     ATOMIC_OBJECT(UISelectItemSource, Object)
 

Source/Atomic/UI/UISelectList.h

@@ -33,7 +33,7 @@ namespace tb
 namespace Atomic
 {
 
-class UISelectList : public UIWidget
+class ATOMIC_API UISelectList : public UIWidget
 {
     ATOMIC_OBJECT(UISelectList, UIWidget)
 

Source/Atomic/UI/UISeparator.h

@@ -27,7 +27,7 @@
 namespace Atomic
 {
 
-class UISeparator : public UIWidget
+class ATOMIC_API UISeparator : public UIWidget
 {
     ATOMIC_OBJECT(UISeparator, UIWidget)
 

Source/Atomic/UI/UISkinImage.h

@@ -27,7 +27,7 @@
 namespace Atomic
 {
 
-class UISkinImage : public UIWidget
+class ATOMIC_API UISkinImage : public UIWidget
 {
     ATOMIC_OBJECT(UISkinImage, UIWidget)
 

Source/Atomic/UI/UISlider.h

@@ -28,7 +28,7 @@ namespace Atomic
 {
 
 
-class UISlider : public UIWidget
+class ATOMIC_API UISlider : public UIWidget
 {
     ATOMIC_OBJECT(UISlider, UIWidget)
 

Source/Atomic/UI/UITabContainer.h

@@ -29,7 +29,7 @@ namespace Atomic
 
 class UILayout;
 
-class UITabContainer : public UIWidget
+class ATOMIC_API UITabContainer : public UIWidget
 {
     ATOMIC_OBJECT(UITabContainer, UIWidget)
 

Source/Atomic/UI/UITextField.h

@@ -27,7 +27,7 @@
 namespace Atomic
 {
 
-class UITextField : public UIWidget
+class ATOMIC_API UITextField : public UIWidget
 {
     ATOMIC_OBJECT(UITextField, UIWidget)
 

Source/Atomic/UI/UITextureWidget.h

@@ -32,7 +32,7 @@ class UIRenderer;
 
 /// A widget that can render a Texture2D, so the image data
 /// doesn't need to be loaded 2x (once for Texture2D and once for say a UIImageWidget)
-class UITextureWidget : public UIWidget
+class ATOMIC_API UITextureWidget : public UIWidget
 {
     friend class TBTextureWidget;
 

Source/Atomic/UI/UIView.h

@@ -28,7 +28,7 @@ namespace Atomic
 {
 
 /// a view off the root widget
-class UIView : public UIWidget
+class ATOMIC_API UIView : public UIWidget
 {
     ATOMIC_OBJECT(UIView, UIWidget)
 

Source/Atomic/UI/UIWidget.h

@@ -168,7 +168,7 @@ class UILayoutParams;
 class UIFontDescription;
 
 /// Wraps a TurboBadger widget in our Object model
-class UIWidget : public Object, public tb::TBWidgetDelegate
+class ATOMIC_API UIWidget : public Object, public tb::TBWidgetDelegate
 {
     friend class UI;
 

Source/Atomic/UI/UIWindow.h

@@ -47,7 +47,7 @@ enum UI_WINDOW_SETTINGS {
 };
 
 
-class UIWindow : public UIWidget
+class ATOMIC_API UIWindow : public UIWidget
 {
     ATOMIC_OBJECT(UIWindow, UIWidget)
 

Source/Atomic/Web/WebInternalConfig.h

@@ -33,4 +33,3 @@
 #define ASIO_STANDALONE
 #define ASIO_HAS_STD_ARRAY
 #define ASIO_HAS_CSTDINT
-#define CURL_STATICLIB

Source/Atomic/Web/WebRequest.h

@@ -54,7 +54,7 @@ enum WebRequestState
 struct WebRequestInternalState;
 
 /// An HTTP(S) connection with response data stream that uses curl internally
-class WebRequest : public Object
+class ATOMIC_API WebRequest : public Object
 {
     friend class Web;
 

Source/Atomic/Web/WebSocket.h

@@ -70,7 +70,7 @@ enum WebSocketMessageType
 struct WebSocketInternalState;
 
 /// A WebSocket connection.
-class WebSocket : public Object
+class ATOMIC_API WebSocket : public Object
 {
     friend class Web;
 

Source/AtomicJS/Javascript/JSComponent.h

@@ -33,7 +33,7 @@ namespace Atomic
 class JSVM;
 
 /// JavaScript component
-class ATOMIC_API JSComponent : public ScriptComponent
+class JSComponent : public ScriptComponent
 {
     friend class JSComponentFactory;
     friend class JSComponentFile;

Source/AtomicJS/Javascript/JSComponentFile.h

@@ -34,7 +34,7 @@ namespace Atomic
 class JSComponent;
 
 /// Script document resource.
-class ATOMIC_API JSComponentFile : public ScriptComponentFile
+class JSComponentFile : public ScriptComponentFile
 {
     ATOMIC_OBJECT(JSComponentFile, ScriptComponentFile);
 

Source/AtomicJS/Javascript/JSDebugger.h

@@ -29,7 +29,7 @@ namespace Atomic
 
 
 /// JavaScript/TypeScript Debugger Subsystem
-class ATOMIC_API JSDebugger : public Object
+class JSDebugger : public Object
 {
 
     ATOMIC_OBJECT(JSDebugger, Object)

Source/AtomicJS/Javascript/JSEventHelper.h

@@ -28,7 +28,7 @@
 namespace Atomic
 {
 
-class ATOMIC_API JSEventDispatcher : public Object, public GlobalEventListener
+class JSEventDispatcher : public Object, public GlobalEventListener
 {
     ATOMIC_OBJECT(JSEventDispatcher, Object)
 
@@ -49,7 +49,7 @@ private:
 
 };
 
-class ATOMIC_API JSEventHelper : public Object
+class JSEventHelper : public Object
 {
     ATOMIC_OBJECT(JSEventHelper, Object);
 

Source/AtomicJS/Javascript/JSMetrics.cpp

@@ -20,13 +20,14 @@
 // THE SOFTWARE.
 //
 
-#include <Atomic/Container/Sort.h>
 #include <Atomic/Scene/Node.h>
 
 #include "JSVM.h"
 #include "JSComponent.h"
 #include "JSMetrics.h"
 
+#include <Atomic/Container/Sort.h>
+
 namespace Atomic
 {
 

Source/AtomicJS/Javascript/JSVM.h

@@ -49,7 +49,7 @@ typedef void(*JSVMPackageRegistrationFunction)(JSVM* vm);
 /// Registration signature for JSVM package registration with settings
 typedef void(*JSVMPackageRegistrationSettingsFunction)(JSVM* vm, const VariantMap& setting);
 
-class ATOMIC_API JSVM : public Object
+class JSVM : public Object
 {
 
     friend class JSMetrics;

Source/AtomicJS/Javascript/Javascript.h

@@ -32,7 +32,7 @@ namespace Atomic
 class JSVM;
 
 /// Javascript subsystem.
-class ATOMIC_API Javascript : public Object
+class Javascript : public Object
 {
     ATOMIC_OBJECT(Javascript, Object);
 
@@ -61,6 +61,6 @@ private:
 };
 
 /// Register Javascript library objects.
-void ATOMIC_API RegisterJavascriptLibrary(Context* context);
+void RegisterJavascriptLibrary(Context* context);
 
 }

Source/AtomicNET/NETNative/NETCore.h

@@ -41,7 +41,7 @@ struct NETCoreDelegates
     NETCoreThrowManagedExceptionFunction throwManagedException;
 };
 
-class ATOMIC_API NETCore : public Object
+class NETCore : public Object
 {
 
     ATOMIC_OBJECT(NETCore, Object)

Source/AtomicNET/NETNative/NETEventDispatcher.h

@@ -28,7 +28,7 @@
 namespace Atomic
 {
 
-class ATOMIC_API NETEventDispatcher : public Object, public GlobalEventListener
+class NETEventDispatcher : public Object, public GlobalEventListener
 {
     ATOMIC_OBJECT(NETEventDispatcher, Object);
 

Source/AtomicNET/NETScript/CSComponent.h

@@ -30,7 +30,7 @@
 namespace Atomic
 {
 
-class ATOMIC_API CSComponent : public ScriptComponent
+class CSComponent : public ScriptComponent
 {
     friend class CSComponentFactory;
 

Source/AtomicNET/NETScript/CSComponentAssembly.h

@@ -36,7 +36,7 @@ namespace Atomic
     class NETVariantMap;
 
     /// NET Assembly resource.
-    class ATOMIC_API CSComponentAssembly : public ScriptComponentFile
+    class CSComponentAssembly : public ScriptComponentFile
     {
         ATOMIC_OBJECT(CSComponentAssembly, ScriptComponentFile)
 

Source/AtomicWebView/WebBrowserHost.h

@@ -33,7 +33,7 @@ class WebClient;
 typedef HashMap<String, HashMap<String, Variant>> GlobalPropertyMap;
 
 /// Browser host subsystem, responsible for initializing CEF
-class ATOMIC_API WebBrowserHost : public Object
+class WebBrowserHost : public Object
 {
     ATOMIC_OBJECT(WebBrowserHost, Object);
 

Source/AtomicWebView/WebClient.h

@@ -35,7 +35,7 @@ class WebClientPrivate;
 class WebMessageHandler;
 
 /// WebClient is the main interface for communicating with a browser instance
-class ATOMIC_API WebClient : public Object
+class WebClient : public Object
 {
     friend class WebBrowserHost;
     friend class WebClientPrivate;

Source/AtomicWebView/WebRenderHandler.h

@@ -34,7 +34,7 @@ class WebClient;
 
 
 /// Base class for various WebRenderHandlers
-class ATOMIC_API WebRenderHandler : public Object
+class WebRenderHandler : public Object
 {
     ATOMIC_OBJECT(WebRenderHandler, Object);
 

Source/AtomicWebView/WebTexture2D.h

@@ -34,7 +34,7 @@ class WebTexture2DPrivate;
 
 
 /// A render handler which uses a Texture2D and can be used for UI, 2D, and 3D rendering
-class ATOMIC_API WebTexture2D : public WebRenderHandler
+class  WebTexture2D : public WebRenderHandler
 {
     friend class WebTexture2DPrivate;
 

Source/ThirdParty/TurboBadger/CMakeLists.txt

@@ -22,3 +22,6 @@ set (SOURCE_FILES ${C_FILES} ${H_FILES})
 
 add_library(TurboBadger ${SOURCE_FILES})
 target_include_directories(TurboBadger SYSTEM BEFORE PUBLIC .)
+if (NOT MSVC)
+    target_compile_options(TurboBadger PRIVATE -std=gnu++11)
+endif ()

Source/ToolCore/Import/ImportConfig.h

@@ -31,8 +31,7 @@ namespace Atomic
 
 class Context;
 
-class ImportConfig :
-    Configuration
+class ImportConfig : Configuration
 {
 
 public: