Windows updates

CMakeLists.txt

@@ -18,9 +18,9 @@ if (NOT EMSCRIPTEN)
     set (ATOMIC_LINK_LIBRARIES ${ATOMIC_LINK_LIBRARIES} SDL Civetweb Recast Detour kNet )
 endif()
 
-if (NOT MSVC)
+#if (NOT MSVC)
     add_definitions(-DATOMIC_API=)
-endif()
+#endif()
 
 if (MSVC)
 

Source/AtomicEditor/AtomicEditorWindows.cmake

@@ -0,0 +1,4 @@
+
+
+
+

Source/AtomicEditor/CMakeLists.txt

@@ -44,4 +44,6 @@ endif ()
 
 if (APPLE)
     include(AtomicEditorMac.cmake)
-endif(APPLE)
+elseif(MSVC)
+    include(AtomicEditorWindows.cmake)
+endif()

Source/AtomicJS/CMakeLists.txt

@@ -1,4 +1,18 @@
 
+if (MSVC)
+    set (JAVASCRIPT_BINDINGS_PLATFORM "WINDOWS")
+elseif(APPLE)
+    if (NOT IOS)
+      set (JAVASCRIPT_BINDINGS_PLATFORM "MACOSX")
+    else()
+      set (JAVASCRIPT_BINDINGS_PLATFORM "IOS")
+    endif()
+elseif(ANDROID)
+    set (JAVASCRIPT_BINDINGS_PLATFORM "ANDROID")
+elseif (EMSCRIPTEN)
+  set (JAVASCRIPT_BINDINGS_PLATFORM "WEB")
+endif()
+
 if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
     add_subdirectory(JSBind)
 endif()
@@ -12,32 +26,13 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
 
 file (GLOB JAVASCRIPT_SOURCE Javascript/*.cpp Javascript/*.h)
 
-if (MSVC)
-    set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "WINDOWS")  
-else()
+if (NOT MSVC)
     # for kNet
     add_definitions (-DUNIX)
 endif()
 
-if (ANDROID)
-  
-  set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "ANDROID")  
-
-endif()
-
-if (APPLE)
-    if (NOT IOS)
-      set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "MACOSX")  
-    else()
-      set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "IOS")  
-    endif()
-endif()
-
-if (EMSCRIPTEN)
-  set (JAVASCRIPT_BINDINGS_SOURCE_FOLDER "WEB")  
-endif()
 
-file (GLOB JAVASCRIPT_BINDINGS_SOURCE ${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_SOURCE_FOLDER}/Javascript/Modules/*.cpp)
+file (GLOB JAVASCRIPT_BINDINGS_SOURCE ${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Modules/*.cpp)
 
 set (SOURCE_FILES ${JAVASCRIPT_SOURCE} ${JAVASCRIPT_BINDINGS_SOURCE} )
 

Source/AtomicJS/JSBind/CMakeLists.txt

@@ -12,6 +12,6 @@ add_executable(JSBind ${SOURCE_FILES})
 target_link_libraries(JSBind ${ATOMIC_LINK_LIBRARIES})
 
 add_custom_command (TARGET JSBind POST_BUILD
-                    COMMAND $<TARGET_FILE:JSBind> "\"${CMAKE_SOURCE_DIR}\"" MACOSX
+                    COMMAND $<TARGET_FILE:JSBind> "\"${CMAKE_SOURCE_DIR}\"" "${JAVASCRIPT_BINDINGS_PLATFORM}"
                     COMMENT "Generating Javascript Bindings")
 

Source/AtomicJS/JSBind/JSBModule.cpp

@@ -184,11 +184,8 @@ void JSBModule::WriteIncludes(String& source)
 
 		String headerfile = GetFileNameAndExtension(header->filepath_);
 
-#ifdef WIN32
-        headerPath.Replace(JSBind::ROOT_FOLDER + "/Source/Atomic/", "");
-#else
         headerPath.Replace(JSBind::ROOT_FOLDER + "/Source/Atomic/", "Atomic/");
-#endif        
+
         source.AppendWithFormat("#include <%s%s>\n", headerPath.CString(), headerfile.CString());
 
         included.Push(header);