Working on Windows (had to update CMake)

CMake/Modules/AtomicWindows.cmake

@@ -6,7 +6,7 @@ set (CMAKE_DEBUG_POSTFIX _d)
 
 add_definitions(-DATOMIC_PLATFORM_WINDOWS -D_CRT_SECURE_NO_WARNINGS -DATOMIC_TBUI)
 
-list (APPEND ATOMIC_LINK_LIBRARIES MojoShader user32 gdi32 winmm imm32 ole32 oleaut32 version uuid d3d9 d3dcompiler)
+list (APPEND ATOMIC_LINK_LIBRARIES MojoShader user32 gdi32 winmm imm32 ole32 oleaut32 version uuid d3d9 d3dcompiler Ws2_32)
 
 # compile with static runtime
 set(CompilerFlags

CMakeLists.txt

@@ -1,7 +1,7 @@
 
 project (Atomic)
 
-cmake_minimum_required (VERSION 3.0.0)
+cmake_minimum_required (VERSION 3.2.1)
 
 set (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
 

Source/AtomicEditor/CMakeLists.txt

@@ -59,21 +59,28 @@ add_custom_command (OUTPUT "${CMAKE_SOURCE_DIR}/Bin/CoreData.pak"
 add_custom_target(BuildEditorDataPak DEPENDS "${CMAKE_SOURCE_DIR}/Bin/EditorData.pak")
 add_custom_target(BuildCoreDataPak DEPENDS "${CMAKE_SOURCE_DIR}/Bin/CoreData.pak")
 
-add_dependencies( AtomicEditor BuildCoreDataPak BuildEditorDataPak)
-
 if (APPLE)
 
     add_custom_target(CopyPakFiles ALL
-                       COMMAND
-                       rsync -u "${CMAKE_SOURCE_DIR}/Bin/EditorData.pak" "$<TARGET_FILE_DIR:AtomicEditor>/../Resources/EditorData.pak"
-                       COMMAND
-                       rsync -u "${CMAKE_SOURCE_DIR}/Bin/CoreData.pak" "$<TARGET_FILE_DIR:AtomicEditor>/../Resources/CoreData.pak"
-                       COMMENT "Copying Editor Resources")
+                      COMMAND
+                      rsync -u "${CMAKE_SOURCE_DIR}/Bin/EditorData.pak" "$<TARGET_FILE_DIR:AtomicEditor>/../Resources/EditorData.pak"
+                      COMMAND
+                      rsync -u "${CMAKE_SOURCE_DIR}/Bin/CoreData.pak" "$<TARGET_FILE_DIR:AtomicEditor>/../Resources/CoreData.pak"
+                      COMMENT "Copying Editor Resources")
+
 
 else()
 
+    add_custom_target(CopyPakFiles ALL
+                      COMMAND xcopy \"${CMAKE_SOURCE_DIR}\\Bin\\EditorData.pak\" \"$<TARGET_FILE_DIR:AtomicEditor>\" /y
+                      COMMAND xcopy \"${CMAKE_SOURCE_DIR}\\Bin\\CoreData.pak\" \"$<TARGET_FILE_DIR:AtomicEditor>\" /y
+                      COMMENT "Copying Editor Resources")
+
 endif()
 
+add_dependencies( AtomicEditor BuildCoreDataPak BuildEditorDataPak)
+
+
 
 
 

Source/AtomicEditor/Source/AEApplication.cpp

@@ -72,7 +72,7 @@ void AEApplication::Start()
 #ifdef __APPLE__    
     String editorResources = fileSystem->GetAppBundleResourceFolder() + "EditorData.pak";
 #else
-    String editorResources = fileSystem->GetProgramDir() + "EditorData/";
+    String editorResources = fileSystem->GetProgramDir() + "EditorData.pak";
 #endif    
     assert(fileSystem->FileExists(editorResources));
     cache->AddPackageFile(editorResources);

Source/CMakeLists.txt

@@ -7,7 +7,6 @@ add_subdirectory(AtomicPlayer)
 if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)    
     add_subdirectory(Tools)
     add_subdirectory(AtomicEditor)
-
 endif()