Fixing Windows build

CLI/atomic-cli-windows/package.json

@@ -0,0 +1,28 @@
+{
+  "author": {
+    "email": "[email protected]",
+    "name": "Atomic Game Engine",
+    "url": "http://www.AtomicGameEngine.com"
+  },
+  "bugs": {
+    "url": "https://github.com/AtomicGameEngine/AtomicGameEngine/issues"
+  },
+  "dependencies": {
+    "atomic-cli-mac-data" : "file:atomic-cli-windows-data"
+  },
+  "description": "Windows dependencies for atomic-cli package",
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "homepage": "http://www.AtomicGameEngine.com",
+   "licenses": [{
+    "type": "Atomic Game Engine",
+    "url": "https://github.com/AtomicGameEngine/AtomicGameEngine/blob/master/LICENSE.md"
+  }],
+  "main": "./index.js",
+  "name": "atomic-cli-windows",
+  "preferGlobal": true,
+  "repository": "https://github.com/AtomicGameEngine/AtomicGameEngine",
+  "version": "0.0.1",
+  "os" : ["win32"]
+}

Source/Atomic/Graphics/Direct3D9/D3D9Graphics.cpp

@@ -21,14 +21,9 @@
 //
 
 #include "Precompiled.h"
-#include "../../Graphics/AnimatedModel.h"
-#include "../../Graphics/Animation.h"
-#include "../../Graphics/AnimationController.h"
 #include "../../Graphics/Camera.h"
 #include "../../Core/Context.h"
-#include "../../Graphics/CustomGeometry.h"
 #include "../../Graphics/DebugRenderer.h"
-#include "../../Graphics/DecalSet.h"
 #include "../../IO/File.h"
 #include "../../Graphics/Graphics.h"
 #include "../../Graphics/GraphicsEvents.h"
@@ -37,19 +32,13 @@
 #include "../../IO/Log.h"
 #include "../../Graphics/Material.h"
 #include "../../Graphics/Octree.h"
-#include "../../Graphics/ParticleEffect.h"
-#include "../../Graphics/ParticleEmitter.h"
 #include "../../Core/ProcessUtils.h"
 #include "../../Core/Profiler.h"
 #include "../../Resource/ResourceCache.h"
 #include "../../Graphics/Shader.h"
 #include "../../Graphics/ShaderPrecache.h"
 #include "../../Graphics/ShaderVariation.h"
-#include "../../Graphics/Skybox.h"
-#include "../../Graphics/StaticModelGroup.h"
 #include "../../Graphics/Technique.h"
-#include "../../Graphics/Terrain.h"
-#include "../../Graphics/TerrainPatch.h"
 #include "../../Graphics/Texture2D.h"
 #include "../../Graphics/Texture3D.h"
 #include "../../Graphics/TextureCube.h"
@@ -2876,9 +2865,7 @@ void Graphics::SetTextureUnitMappings()
 
 void RegisterGraphicsLibrary(Context* context)
 {
-    Animation::RegisterObject(context);
     Material::RegisterObject(context);
-    Model::RegisterObject(context);
     Shader::RegisterObject(context);
     Technique::RegisterObject(context);
     Texture2D::RegisterObject(context);
@@ -2887,18 +2874,6 @@ void RegisterGraphicsLibrary(Context* context)
     Camera::RegisterObject(context);
     Drawable::RegisterObject(context);
     Light::RegisterObject(context);
-    StaticModel::RegisterObject(context);
-    StaticModelGroup::RegisterObject(context);
-    Skybox::RegisterObject(context);
-    AnimatedModel::RegisterObject(context);
-    AnimationController::RegisterObject(context);
-    BillboardSet::RegisterObject(context);
-    ParticleEffect::RegisterObject(context);
-    ParticleEmitter::RegisterObject(context);
-    CustomGeometry::RegisterObject(context);
-    DecalSet::RegisterObject(context);
-    Terrain::RegisterObject(context);
-    TerrainPatch::RegisterObject(context);
     DebugRenderer::RegisterObject(context);
     Octree::RegisterObject(context);
     Zone::RegisterObject(context);

Source/AtomicEditor/CMakeLists.txt

@@ -15,12 +15,11 @@ if (APPLE)
     #ICNS
     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_source_files_properties(${ATOMIC_EDITOR_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 else()
-    include_directories (${CMAKE_CURRENT_SOURCE_DIR}/Vendor/libcurl/include)
+    include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/libcurl/include)
     add_definitions(-DCURL_STATICLIB)
     set (EXE_TYPE WIN32)
-    set (SOURCE_FILES ${SOURCE_FILES} Vendor/nativefiledialog/nfd_win.cpp Vendor/nativefiledialog/nfd.h)
     set (SOURCE_FILES ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/CMake/Modules/Atomic.rc)
 endif(APPLE)
 
@@ -28,7 +27,7 @@ add_executable(AtomicEditor ${EXE_TYPE} ${SOURCE_FILES} ${ATOMIC_EDITOR_ICON})
 
 target_link_libraries(AtomicEditor ${ATOMIC_LINK_LIBRARIES} AtomicJS Poco nativefiledialog)
 
-if (APPLE)    
+if (APPLE)
     set (TARGET_PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.template)
     target_link_libraries(AtomicEditor curl)
 else()

Source/AtomicTool/AtomicTool.cpp

@@ -12,10 +12,10 @@
 
 #include "AtomicTool.h"
 
-using namespace ToolCore;
-
 DEFINE_APPLICATION_MAIN(AtomicTool::AtomicTool);
 
+using namespace ToolCore;
+
 namespace AtomicTool
 {
 

Source/AtomicTool/CMakeLists.txt

@@ -1,7 +1,17 @@
 set (ATOMIC_TOOL_SOURCES AtomicTool.cpp AtomicTool.h)
 
-add_executable(AtomicTool ${ATOMIC_TOOL_SOURCES})
+if (MSVC)
+    set (EXE_TYPE WIN32)
+endif()
 
-target_link_libraries(AtomicTool ${ATOMIC_LINK_LIBRARIES} ToolCore Poco curl)
+add_executable(AtomicTool ${EXE_TYPE} ${ATOMIC_TOOL_SOURCES})
+
+target_link_libraries(AtomicTool ${ATOMIC_LINK_LIBRARIES} ToolCore Poco)
 
 add_dependencies(AtomicTool AtomicEditor)
+
+if (MSVC)
+    target_link_libraries(AtomicTool libcurl Iphlpapi Wldap32)
+else()
+    target_link_libraries(AtomicTool curl)
+endif()

Source/ThirdParty/CMakeLists.txt

@@ -33,6 +33,6 @@ if (APPLE AND NOT IOS)
 endif()
 
 if (MSVC)
-	add_subdirectory(libcurl)
+    add_subdirectory(libcurl)
     add_subdirectory(MojoShader)
-endif()
+endif()

Source/ThirdParty/libcurl/CMakeLists.txt

@@ -1,8 +1,7 @@
 
+add_definitions(-DCURL_STATICLIB -DUSE_WINDOWS_SSPI -DUSE_SCHANNEL)
 
-add_definitions(-DUSE_WINDOWS_SSPI -DUSE_SCHANNEL)
-
-include_directories (lib)
+include_directories (include lib)
 
 file (GLOB_RECURSE SOURCE_FILES lib/*.c )
 

Source/ThirdParty/nativefiledialog/CMakeLists.txt

@@ -5,4 +5,9 @@ if (APPLE)
     set (SOURCE_FILES ${SOURCE_FILES} nfd_cocoa.mm )
 endif( APPLE)
 
-add_library(nativefiledialog ${SOURCE_FILES})
+if (MSVC)
+    set (SOURCE_FILES ${SOURCE_FILES} nfd_win.cpp )
+endif( MSVC)
+
+
+add_library(nativefiledialog ${SOURCE_FILES})

Source/ToolCore/CMakeLists.txt

@@ -4,6 +4,11 @@ include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/rapidjson/include
                      ${CMAKE_SOURCE_DIR}/Source/ThirdParty/nativefiledialog)
 
 
+if (MSVC)
+    include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/libcurl/include)
+    add_definitions(-DCURL_STATICLIB)
+endif()
+
 file (GLOB_RECURSE SOURCE_FILES Source/*.cpp Source/*.h)
 
 add_definitions(-DPOCO_NO_AUTOMATIC_LIBS)