mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 00:57:44 -04:00
Fix for cmake
This commit is contained in:
parent
ef09eb12c8
commit
39eb3a90ea
|
@ -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()
|
||||
ENDIF()
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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
|
||||
|
|
1
gc.sh
1
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 "$@"
|
1
gk.sh
1
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 "$@"
|
||||
|
|
Loading…
Reference in a new issue