Merge pull request #197 from pspdev/fix-broken-state

Fix broken state
pspdev · Apr 16, 2024 · 98c48fa · 98c48fa
2 parents ae722cb + 265535a
commit 98c48fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/base/build.mak b/src/base/build.mak
@@ -27,10 +27,10 @@ FIXUP    = psp-fixup-imports
 ENC		 = PrxEncrypter
 
 # Add PSPSDK includes and libraries.
-INCDIR   := $(INCDIR) . $(PSPSDK)/include
+INCDIR   := $(INCDIR) . $(PSPDEV)/psp/include $(PSPSDK)/include
 LIBDIR   := $(LIBDIR) . $(PSPDEV)/psp/lib $(PSPSDK)/lib
 
-CFLAGS   := -isystem $(PSPDEV)/psp/include $(addprefix -I,$(INCDIR)) $(CFLAGS)
+CFLAGS   := $(addprefix -I,$(INCDIR)) $(CFLAGS)
 CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
 ASFLAGS  := $(CFLAGS) $(ASFLAGS)
 

diff --git a/src/base/pspdev.cmake b/src/base/pspdev.cmake
@@ -9,7 +9,7 @@ SET(CMAKE_SYSTEM_VERSION 1)
 SET(CMAKE_SYSTEM_PROCESSOR mips)
 SET(CMAKE_C_COMPILER psp-gcc)
 SET(CMAKE_CXX_COMPILER psp-g++)
-SET(CMAKE_C_FLAGS_INIT "-isystem ${PSPDEV}/psp/include -I${PSPDEV}/psp/sdk/include -DPSP")
+SET(CMAKE_C_FLAGS_INIT "-I${PSPDEV}/psp/include -I${PSPDEV}/psp/sdk/include -DPSP")
 SET(CMAKE_CXX_FLAGS_INIT "-I${PSPDEV}/psp/include -I${PSPDEV}/psp/sdk/include -DPSP")
 SET(CMAKE_EXE_LINKER_FLAGS_INIT "-L${PSPDEV}/lib -L${PSPDEV}/psp/lib -L${PSPDEV}/psp/sdk/lib -Wl,-zmax-page-size=128")
 #SET(CMAKE_SHARED_LINKER_FLAGS_INIT "...")