From ea46d05aed0343c20d8fdfaa0e67d54d51e8e2a0 Mon Sep 17 00:00:00 2001 From: "John Wilbert M. Villamor" Date: Fri, 22 Nov 2019 09:11:12 +0800 Subject: Added long awaited CD-ROM library and loads of fixes, see changelog for details --- examples/fpscam/makefile | 6 ------ 1 file changed, 6 deletions(-) (limited to 'examples/fpscam/makefile') 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 -- cgit v1.2.3