diff options
Diffstat (limited to 'examples/fpscam/makefile')
| -rw-r--r-- | examples/fpscam/makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/examples/fpscam/makefile b/examples/fpscam/makefile index 7175c98..67fe7c2 100644 --- a/examples/fpscam/makefile +++ b/examples/fpscam/makefile @@ -11,7 +11,13 @@ 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 |