aboutsummaryrefslogtreecommitdiff
path: root/examples/fpscam/makefile
diff options
context:
space:
mode:
Diffstat (limited to 'examples/fpscam/makefile')
-rw-r--r--examples/fpscam/makefile6
1 files changed, 0 insertions, 6 deletions
diff --git a/examples/fpscam/makefile b/examples/fpscam/makefile
index 67fe7c2..4f344eb 100644
--- a/examples/fpscam/makefile
+++ b/examples/fpscam/makefile
@@ -11,13 +11,7 @@ OFILES = $(addprefix build/,$(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(AFILES:.s=.o)
INCLUDE +=
LIBDIRS +=
-<<<<<<< .mine
LIBS = -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lc
-||||||| .r23
-LIBS = -lc -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lgcc
-=======
-LIBS = -lc -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lc
->>>>>>> .r27
CFLAGS = -g -O2 -fno-builtin -fdata-sections -ffunction-sections
CPPFLAGS = $(CFLAGS) -fno-exceptions