From 39eb3a90eaaf3f685367e3756cb9be6a5aba1883 Mon Sep 17 00:00:00 2001
From: Tyler Wilding <xtvaser@gmail.com>
Date: Thu, 3 Sep 2020 22:37:00 -0400
Subject: [PATCH] Fix for cmake

---
 CMakeLists.txt        | 25 +++++++++++++------------
 game/CMakeLists.txt   | 23 ++++++++++++-----------
 game/kernel/kdsnetm.h |  5 ++++-
 gc.sh                 |  1 +
 gk.sh                 |  1 +
 test.sh               |  1 +
 6 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4eb4c9bc27..7229990ef2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,17 +9,18 @@ set(CMAKE_CXX_STANDARD 14)
 if(CMAKE_COMPILER_IS_GNUCXX)
     message(STATUS "GCC detected, adding compile flags")
     set(CMAKE_CXX_FLAGS 
-        "${CMAKE_CXX_FLAGS} 
-        -Wall-Winit-self 
-        -Wextra
-        -Wcast-align
-        -Wcast-qual
-        -Wdisabled-optimization
-        -Wformat=2
-        -Wmissing-include-dirs
-        -Woverloaded-virtual
-        -Wredundant-decls
-        -Wshadow
+        "${CMAKE_CXX_FLAGS} \
+        -Wall \
+				-Winit-self \
+        -Wextra \
+        -Wcast-align \
+        -Wcast-qual \
+        -Wdisabled-optimization \
+        -Wformat=2 \
+        -Wmissing-include-dirs \
+        -Woverloaded-virtual \
+        -Wredundant-decls \
+        -Wshadow \
         -Wsign-promo")
 else()
 		set(CMAKE_CXX_FLAGS "/EHsc")
@@ -65,4 +66,4 @@ add_subdirectory(third-party/fmt)
 # windows memory management lib
 IF (WIN32)
   add_subdirectory(third-party/mman)
-ENDIF()
\ No newline at end of file
+ENDIF()
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 8e5dfa28f3..a6b6357ee5 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -6,17 +6,18 @@ set(CMAKE_CXX_STANDARD 11)
 if(CMAKE_COMPILER_IS_GNUCXX)
     message(STATUS "GCC detected, adding compile flags")
     set(CMAKE_CXX_FLAGS 
-        "${CMAKE_CXX_FLAGS} 
-        -Wall-Winit-self 
-        -Wextra
-        -Wcast-align
-        -Wcast-qual
-        -Wdisabled-optimization
-        -Wformat=2
-        -Wmissing-include-dirs
-        -Woverloaded-virtual
-        -Wredundant-decls
-        -Wshadow
+        "${CMAKE_CXX_FLAGS} \
+        -Wall \
+				-Winit-self \
+        -Wextra \
+        -Wcast-align \
+        -Wcast-qual \
+        -Wdisabled-optimization \
+        -Wformat=2 \
+        -Wmissing-include-dirs \
+        -Woverloaded-virtual \
+        -Wredundant-decls \
+        -Wshadow \
         -Wsign-promo")
 else()
 		set(CMAKE_CXX_FLAGS "/EHsc")
diff --git a/game/kernel/kdsnetm.h b/game/kernel/kdsnetm.h
index 60b6f3715d..51125e0c1f 100644
--- a/game/kernel/kdsnetm.h
+++ b/game/kernel/kdsnetm.h
@@ -74,13 +74,16 @@ void ShutdownGoalProto();
  */
 void GoalProtoHandler(int event, int param, void* data);
 
+// TODO-WINDOWS
+#ifdef __linux__
 /*!
  * Low level DECI2 send
  * Will block until send is complete.
  * DONE, original version used an uncached address and had a FlushCache call, which were both
  * removed
  */
-//s32 SendFromBufferD(s32 p1, u64 p2, char* data, s32 size);
+s32 SendFromBufferD(s32 p1, u64 p2, char* data, s32 size);
+#endif
 
 /*!
  * Print GOAL Protocol status
diff --git a/gc.sh b/gc.sh
index 19ab0e192f..ac079580a1 100755
--- a/gc.sh
+++ b/gc.sh
@@ -4,4 +4,5 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 export NEXT_DIR=$DIR
+export FAKE_ISO_PATH=/game/fake_iso.txt
 $DIR/build/goalc/goalc "$@"
\ No newline at end of file
diff --git a/gk.sh b/gk.sh
index f33bbcd06f..d49ccff100 100755
--- a/gk.sh
+++ b/gk.sh
@@ -4,4 +4,5 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 export NEXT_DIR=$DIR
+export FAKE_ISO_PATH=/game/fake_iso.txt
 $DIR/build/game/gk "$@"
diff --git a/test.sh b/test.sh
index 3cff7a5976..6370a8a2db 100755
--- a/test.sh
+++ b/test.sh
@@ -4,4 +4,5 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 export NEXT_DIR=$DIR
+export FAKE_ISO_PATH=/game/fake_iso.txt
 $DIR/build/test/goalc-test --gtest_color=yes "$@"
\ No newline at end of file