From 9d8f3648a0957b6bd32241372778e7081d2c5a16 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Fri, 9 Feb 2018 20:11:30 +1100
Subject: [PATCH 1/2] fix script builds and logging issues on WSL

---
 src/servers/sapphire_api/main.cpp               |  2 +-
 src/servers/sapphire_lobby/ServerLobby.cpp      |  2 +-
 .../sapphire_zone/Script/Scripts/CMakeLists.txt | 17 ++++++++++-------
 src/servers/sapphire_zone/ServerZone.cpp        |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/servers/sapphire_api/main.cpp b/src/servers/sapphire_api/main.cpp
index 1a6fe25f..bcce3189 100644
--- a/src/servers/sapphire_api/main.cpp
+++ b/src/servers/sapphire_api/main.cpp
@@ -739,7 +739,7 @@ void defaultGet( shared_ptr<HttpServer::Response> response, shared_ptr<HttpServe
 
 int main( int argc, char* argv[] )
 {
-   g_log.setLogPath( "log\\SapphireAPI" );
+   g_log.setLogPath( "log/SapphireAPI" );
    g_log.init();
 
    g_log.info( "===========================================================" );
diff --git a/src/servers/sapphire_lobby/ServerLobby.cpp b/src/servers/sapphire_lobby/ServerLobby.cpp
index 9c0e05d3..80e13d89 100644
--- a/src/servers/sapphire_lobby/ServerLobby.cpp
+++ b/src/servers/sapphire_lobby/ServerLobby.cpp
@@ -54,7 +54,7 @@ namespace Core {
 
    void ServerLobby::run( int32_t argc, char* argv[] )
    {
-      g_log.setLogPath( "log\\SapphireLobby" );
+      g_log.setLogPath( "log/SapphireLobby" );
       g_log.init();
 
       g_log.info( "===========================================================" );
diff --git a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
index aeaa0094..31921d03 100644
--- a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
+++ b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
@@ -21,7 +21,8 @@ foreach(_scriptDir ${children})
     if(IS_DIRECTORY ${_scriptDir} AND NOT ${_name} MATCHES "CMakeFiles")
         message("discovered plugin lib: ${_scriptDir} (${_name})")
 
-        file(GLOB_RECURSE SCRIPT_FILES "${_scriptDir}/*.cpp")
+        file(GLOB_RECURSE SCRIPT_BUILD_FILES "${_scriptDir}/*.cpp")
+        file(GLOB_RECURSE SCRIPT_FILES RELATIVE "${_scriptDir}" "${_name}/*.cpp")
 
         # build file list
         foreach(_script ${SCRIPT_FILES})
@@ -31,7 +32,7 @@ foreach(_scriptDir ${children})
                 if(ScriptIncludes)
                     set(ScriptIncludes "${ScriptIncludes}\n#include \"${_script}\"")
                 else()
-                    set(ScriptIncludes "#include \"${_script}\"")
+                    set(ScriptIncludes "#include \"./${_script}\"")
                 endif()
 
                 set(ScriptNames "${ScriptNames}   static_cast< ScriptObject* >( new ${_scriptname} ),\n")
@@ -55,11 +56,13 @@ foreach(_scriptDir ${children})
 
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp")
 
-        add_custom_command(TARGET "script_${_name}" POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.exp"
-            COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.lib"
-            COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.ilk"
-        )
+        if(MSVC)
+            add_custom_command(TARGET "script_${_name}" POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.exp"
+                COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.lib"
+                COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.ilk"
+            )
+        endif()
 
         unset(ScriptIncludes)
         unset(ScriptNames)
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index ee723654..9f2f3785 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -193,7 +193,7 @@ bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] )
 void Core::ServerZone::run( int32_t argc, char* argv[] )
 {
    // TODO: add more error checks for the entire initialisation
-   g_log.setLogPath( "log\\SapphireZone_" );
+   g_log.setLogPath( "log/SapphireZone_" );
    g_log.init();
 
    printBanner();

From ca42ed228d29a9c754e9f1b9e5e9237c83123e32 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Fri, 9 Feb 2018 20:25:18 +1100
Subject: [PATCH 2/2] builds should work now... probably

---
 src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
index 31921d03..03c76b3c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
+++ b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
@@ -32,14 +32,14 @@ foreach(_scriptDir ${children})
                 if(ScriptIncludes)
                     set(ScriptIncludes "${ScriptIncludes}\n#include \"${_script}\"")
                 else()
-                    set(ScriptIncludes "#include \"./${_script}\"")
+                    set(ScriptIncludes "#include \"${_script}\"")
                 endif()
 
                 set(ScriptNames "${ScriptNames}   static_cast< ScriptObject* >( new ${_scriptname} ),\n")
             endif()
         endforeach()
 
-        add_library("script_${_name}" MODULE "${SCRIPT_FILES}" "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
+        add_library("script_${_name}" MODULE "${SCRIPT_BUILD_FILES}" "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
         target_link_libraries("script_${_name}" sapphire_zone)
 
         if(MSVC)