More Windows tweaks

Build/Scripts/Windows/CompileAtomicEditorPhase2.bat

@@ -7,4 +7,4 @@ if not defined ATOMIC_CMAKE_GENERATOR (
   exit /b 1
 )
 
-msbuild /m Atomic.sln /t: AtomicGlow /t:AtomicEditor /t:AtomicPlayer /p:Configuration=%1 /p:Platform=x64
+msbuild /m Atomic.sln /t:AtomicGlow /t:AtomicEditor /t:AtomicPlayer /p:Configuration=%1 /p:Platform=x64

Source/AtomicGlow/CMakeLists.txt

@@ -17,8 +17,11 @@ target_compile_definitions(AtomicGlowLib PUBLIC -DATOMIC_GLOW=1)
 add_dependencies(AtomicApp AtomicToolCheckScripts)
 
 if (WIN32)
+if (NOT ATOMIC_GLOW_WINDOWS_SUBSYSTEM)
     add_definitions(-DATOMIC_WIN32_CONSOLE)
-endif(WIN32)
+endif()
+endif()
+
 
 file (GLOB GLOW_APPLICATION_SOURCE GlowApplication/*.cpp GlowApplication/*.h)
 
@@ -28,6 +31,9 @@ target_link_libraries(AtomicGlow AtomicApp AtomicJS AtomicNETScript AtomicGlowLi
 
 if (WIN32)
     target_link_libraries(AtomicGlow Iphlpapi Wldap32)
+    if (ATOMIC_GLOW_WINDOWS_SUBSYSTEM)
+        set_target_properties(AtomicGlow PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
+    endif()
 endif()
 
 
@@ -38,4 +44,3 @@ add_custom_command( TARGET AtomicGlow POST_BUILD
                     COMMAND "${CMAKE_COMMAND}"
                     ARGS -E copy_if_different \"$<TARGET_FILE:AtomicGlow>\" \"${ATOMIC_SOURCE_DIR}/Artifacts/Build/AtomicGlow/\"
                     COMMENT "Copying AtomicGlow to Build Artifacts" )
-

Source/CMakeLists.txt

@@ -9,6 +9,7 @@ option(ATOMIC_DATABASE_SQLITE "Enable SQLite database subsystem" OFF)
 option(ATOMIC_DATABASE_ODBC "Enable ODBC database subsystem" OFF)
 option(ATOMIC_IK "Enable inverse kinematics subsystem" OFF)
 option(ATOMIC_GLOW "Build Atomic Glow" ON)
+option(ATOMIC_GLOW_WINDOWS_SUBSYSTEM "Enable WINDOWS subsystem, otherwise CONSOLE is used" ON)
 
 add_subdirectory(ThirdParty)
 add_subdirectory(Atomic)
@@ -30,7 +31,7 @@ endif ()
 
 if (ATOMIC_DESKTOP)
 
-    if (ATOMIC_GLOW)        
+    if (ATOMIC_GLOW)
         add_subdirectory(AtomicGlow)
     endif ()
     if (ATOMIC_DOTNET OR ATOMIC_JAVASCRIPT)