Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 00:57:44 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix for cmake

Browse source
This commit is contained in:
Tyler Wilding 2020-09-03 22:37:00 -04:00
parent ef09eb12c8
commit 39eb3a90ea
6 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
CMakeLists.txt
View file

@ -9,17 +9,18 @@ set(CMAKE_CXX_STANDARD 14)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
message(STATUS "GCC detected, adding compile flags") message(STATUS "GCC detected, adding compile flags")
set(CMAKE_CXX_FLAGS set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} "${CMAKE_CXX_FLAGS} \
-Wall-Winit-self -Wall \
-Wextra -Winit-self \
-Wcast-align -Wextra \
-Wcast-qual -Wcast-align \
-Wdisabled-optimization -Wcast-qual \
-Wformat=2 -Wdisabled-optimization \
-Wmissing-include-dirs -Wformat=2 \
-Woverloaded-virtual -Wmissing-include-dirs \
-Wredundant-decls -Woverloaded-virtual \
-Wshadow -Wredundant-decls \
-Wshadow \
-Wsign-promo") -Wsign-promo")
else() else()
set(CMAKE_CXX_FLAGS "/EHsc") set(CMAKE_CXX_FLAGS "/EHsc")
@ -65,4 +66,4 @@ add_subdirectory(third-party/fmt)
# windows memory management lib # windows memory management lib
IF (WIN32) IF (WIN32)
add_subdirectory(third-party/mman) add_subdirectory(third-party/mman)
ENDIF() ENDIF()

23
game/CMakeLists.txt
View file

@ -6,17 +6,18 @@ set(CMAKE_CXX_STANDARD 11)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
message(STATUS "GCC detected, adding compile flags") message(STATUS "GCC detected, adding compile flags")
set(CMAKE_CXX_FLAGS set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} "${CMAKE_CXX_FLAGS} \
-Wall-Winit-self -Wall \
-Wextra -Winit-self \
-Wcast-align -Wextra \
-Wcast-qual -Wcast-align \
-Wdisabled-optimization -Wcast-qual \
-Wformat=2 -Wdisabled-optimization \
-Wmissing-include-dirs -Wformat=2 \
-Woverloaded-virtual -Wmissing-include-dirs \
-Wredundant-decls -Woverloaded-virtual \
-Wshadow -Wredundant-decls \
-Wshadow \
-Wsign-promo") -Wsign-promo")
else() else()
set(CMAKE_CXX_FLAGS "/EHsc") set(CMAKE_CXX_FLAGS "/EHsc")

5
game/kernel/kdsnetm.h
View file

@ -74,13 +74,16 @@ void ShutdownGoalProto();
*/ */
void GoalProtoHandler(int event, int param, void* data); void GoalProtoHandler(int event, int param, void* data);
// TODO-WINDOWS
#ifdef __linux__
/*! /*!
* Low level DECI2 send * Low level DECI2 send
* Will block until send is complete. * Will block until send is complete.
* DONE, original version used an uncached address and had a FlushCache call, which were both * DONE, original version used an uncached address and had a FlushCache call, which were both
* removed * 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 * Print GOAL Protocol status

1
gc.sh
View file

@ -4,4 +4,5 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export NEXT_DIR=$DIR export NEXT_DIR=$DIR
export FAKE_ISO_PATH=/game/fake_iso.txt
$DIR/build/goalc/goalc "$@" $DIR/build/goalc/goalc "$@"

1
gk.sh
View file

@ -4,4 +4,5 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export NEXT_DIR=$DIR export NEXT_DIR=$DIR
export FAKE_ISO_PATH=/game/fake_iso.txt
$DIR/build/game/gk "$@" $DIR/build/game/gk "$@"

1
test.sh
View file

@ -4,4 +4,5 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export NEXT_DIR=$DIR export NEXT_DIR=$DIR
export FAKE_ISO_PATH=/game/fake_iso.txt
$DIR/build/test/goalc-test --gtest_color=yes "$@" $DIR/build/test/goalc-test --gtest_color=yes "$@"