From 0a803b844d34ea3644248124a83cd7248645db79 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Sat, 13 Nov 2021 16:56:29 +0100 Subject: [PATCH] Update all samples to new requirements, and expose a makefile to compile all of them --- src/samples/Makefile.am | 4 - src/samples/Makefile.samples | 88 +++++++++++++++++++ src/samples/audio/polyphonic/Makefile.sample | 2 +- src/samples/audio/wavegen/Makefile.sample | 2 +- src/samples/audio/wavegen/main.c | 12 +-- src/samples/controller/basic/Makefile.sample | 2 +- src/samples/debug/debugkb/Makefile.sample | 2 +- src/samples/debug/exception/Makefile.sample | 2 +- src/samples/debug/gdb/Makefile.sample | 4 +- src/samples/debug/kprintf/Makefile.sample | 2 +- src/samples/debug/profiler/Makefile.sample | 2 +- src/samples/debug/prxdecrypt/Makefile.sample | 2 +- src/samples/debug/sio/Makefile.sample | 4 +- src/samples/exceptions/Makefile.sample | 2 +- src/samples/gu/beginobject/Makefile.sample | 2 +- src/samples/gu/blend/Makefile.sample | 2 +- src/samples/gu/blit/Makefile.sample | 2 +- src/samples/gu/celshading/Makefile.sample | 2 +- src/samples/gu/clut/Makefile.sample | 2 +- src/samples/gu/clut/clut.c | 2 +- src/samples/gu/copy/Makefile.sample | 2 +- src/samples/gu/cube/Makefile.sample | 2 +- src/samples/gu/envmap/Makefile.sample | 2 +- src/samples/gu/integerdrawing/Makefile.sample | 2 +- src/samples/gu/lights/Makefile.sample | 2 +- src/samples/gu/lines/Makefile.sample | 2 +- src/samples/gu/logic/Makefile.sample | 2 +- src/samples/gu/mipmapping/Makefile.sample | 2 +- src/samples/gu/morph/Makefile.sample | 2 +- src/samples/gu/morphskin/Makefile.sample | 2 +- src/samples/gu/ortho/Makefile.sample | 2 +- src/samples/gu/reflection/Makefile.sample | 2 +- src/samples/gu/rendertarget/Makefile.sample | 2 +- .../gu/shadowprojection/Makefile.sample | 2 +- src/samples/gu/signals/Makefile.sample | 2 +- src/samples/gu/skinning/Makefile.sample | 3 +- src/samples/gu/speed/Makefile.sample | 2 +- src/samples/gu/spharm/Makefile.sample | 2 +- src/samples/gu/splinesurface/Makefile.sample | 2 +- src/samples/gu/sprite/Makefile.sample | 2 +- src/samples/gu/text/Makefile.sample | 2 +- src/samples/gu/timing/Makefile.sample | 2 +- src/samples/gu/vertex/Makefile.sample | 2 +- src/samples/gu/zbufferfog/Makefile.sample | 2 +- src/samples/ir/irda/Makefile.sample | 2 +- src/samples/ir/sircs/Makefile.sample | 2 +- src/samples/kernel/cwd/Makefile.sample | 2 +- src/samples/kernel/cwd/main.c | 1 + src/samples/kernel/fileio/Makefile.sample | 2 +- src/samples/kernel/idstorage/Makefile.sample | 2 +- src/samples/kernel/kdumper/Makefile.sample | 2 +- src/samples/kernel/loadmodule/Makefile.sample | 2 +- src/samples/kernel/messagebox/Makefile.sample | 2 +- src/samples/kernel/regenum/Makefile.sample | 2 +- src/samples/kernel/registry/Makefile.sample | 2 +- src/samples/kernel/sysevent/Makefile.sample | 2 +- src/samples/kernel/systimer/Makefile.sample | 2 +- .../kernel/threadstatus/Makefile.sample | 2 +- src/samples/me/basic/Makefile.sample | 2 +- src/samples/mp3/Makefile.sample | 2 +- src/samples/ms/callback/Makefile.sample | 2 +- src/samples/net/resolver/Makefile.sample | 2 +- src/samples/net/simple/Makefile.sample | 2 +- src/samples/net/simple_prx/Makefile.sample | 2 +- src/samples/net/wlanscan/Makefile.sample | 2 +- src/samples/net/wlanscan_elf/Makefile.sample | 2 +- src/samples/power/Makefile.sample | 6 +- src/samples/prx/prx_loader/Makefile.sample | 4 +- src/samples/prx/testprx/Makefile.sample | 4 +- src/samples/savedata/decrypt/Makefile.sample | 2 +- src/samples/savedata/encrypt/Makefile.sample | 2 +- src/samples/savedata/encrypt/psf.c | 2 +- src/samples/savedata/utility/Makefile.sample | 2 +- .../template/elf_template/Makefile.sample | 2 +- .../template/kprx_template/Makefile.sample | 4 +- .../template/lib_template/Makefile.sample | 2 +- .../template/prx_template/Makefile.sample | 2 +- src/samples/usb/storage/Makefile.sample | 2 +- .../utility/gamesharing/Makefile.sample | 4 +- .../utility/htmlviewer/Makefile.sample | 4 +- src/samples/utility/msgdialog/Makefile.sample | 4 +- src/samples/utility/netconf/Makefile.sample | 3 +- src/samples/utility/netdialog/Makefile.sample | 4 +- src/samples/utility/osk/Makefile.sample | 4 +- .../utility/systemparam/Makefile.sample | 7 +- src/samples/wlan/Makefile.sample | 2 +- 86 files changed, 186 insertions(+), 114 deletions(-) create mode 100644 src/samples/Makefile.samples diff --git a/src/samples/Makefile.am b/src/samples/Makefile.am index 38cb84cd..ba6f7dd9 100644 --- a/src/samples/Makefile.am +++ b/src/samples/Makefile.am @@ -84,10 +84,6 @@ SAMPLES = \ wlan \ exceptions -# FIXME: This workaround is actually needed to get the stage1 installation -# without samples working. Once a better way to do header installation for -# newlib is figured out, this can be rewritten. - all: # Install all of the samples. Rename any files that end in a .sample extension. diff --git a/src/samples/Makefile.samples b/src/samples/Makefile.samples new file mode 100644 index 00000000..a4b4a0bd --- /dev/null +++ b/src/samples/Makefile.samples @@ -0,0 +1,88 @@ +SAMPLES = \ + audio/polyphonic \ + audio/wavegen \ + controller/basic \ + debug/exception \ + debug/kprintf \ + debug/prxdecrypt \ + debug/profiler \ + debug/debugkb \ + debug/sio \ + debug/gdb \ + gu/beginobject \ + gu/blend \ + gu/blit \ + gu/celshading \ + gu/clut \ + gu/copy \ + gu/cube \ + gu/envmap \ + gu/integerdrawing \ + gu/lights \ + gu/lines \ + gu/logic \ + gu/morph \ + gu/morphskin \ + gu/ortho \ + gu/reflection \ + gu/rendertarget \ + gu/shadowprojection \ + gu/signals \ + gu/skinning \ + gu/speed \ + gu/spharm \ + gu/splinesurface \ + gu/sprite \ + gu/text \ + gu/timing \ + gu/vertex \ + gu/zbufferfog \ + ir/sircs \ + ir/irda \ + kernel/kdumper \ + kernel/loadmodule \ + kernel/threadstatus \ + kernel/cwd \ + kernel/fileio \ + kernel/idstorage \ + kernel/messagebox \ + kernel/registry \ + kernel/regenum \ + kernel/systimer \ + kernel/sysevent \ + mp3 \ + ms/callback \ + nand/dumpipl \ + net/simple \ + net/simple_prx \ + net/resolver \ + net/wlanscan \ + net/wlanscan_elf \ + power \ + prx/prx_loader \ + prx/testprx \ + savedata/utility \ + savedata/decrypt \ + savedata/encrypt \ + template/elf_template \ + template/prx_template \ + template/lib_template \ + template/kprx_template \ + usb/storage \ + utility/gamesharing \ + utility/htmlviewer \ + utility/netconf \ + utility/netdialog \ + utility/msgdialog \ + utility/systemparam \ + utility/osk \ + me/basic \ + wlan \ + exceptions + + +all: + for sample in $(SAMPLES) ; do \ + $(MAKE) -f Makefile.sample -C $$sample clean all || break; \ + done + diff --git a/src/samples/audio/polyphonic/Makefile.sample b/src/samples/audio/polyphonic/Makefile.sample index 0ed9c44d..db3c9011 100644 --- a/src/samples/audio/polyphonic/Makefile.sample +++ b/src/samples/audio/polyphonic/Makefile.sample @@ -2,7 +2,7 @@ TARGET = polyphonic OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/audio/wavegen/Makefile.sample b/src/samples/audio/wavegen/Makefile.sample index 90e6c6b0..3f2d315d 100644 --- a/src/samples/audio/wavegen/Makefile.sample +++ b/src/samples/audio/wavegen/Makefile.sample @@ -2,7 +2,7 @@ TARGET = alsample OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/audio/wavegen/main.c b/src/samples/audio/wavegen/main.c index 0ee5fe01..27c3aeff 100644 --- a/src/samples/audio/wavegen/main.c +++ b/src/samples/audio/wavegen/main.c @@ -64,7 +64,7 @@ int setupCallbacks(void) { const float PI = 3.1415926535897932f; const int sampleRate = 44100; float frequency = 440.0f; -float time = 0; +float currentTime = 0; int function = 0; typedef struct { @@ -107,17 +107,17 @@ void audioCallback(void* buf, unsigned int length, void *userdata) { int i; if (frequency != freq0) { - time *= (freq0 / frequency); + currentTime *= (freq0 / frequency); } for (i = 0; i < length; i++) { - short s = (short) (scaleFactor * currentFunction(2.0f * PI * frequency * time)); + short s = (short) (scaleFactor * currentFunction(2.0f * PI * frequency * currentTime)); ubuf[i].l = s; ubuf[i].r = s; - time += sampleLength; + currentTime += sampleLength; } - if (time * frequency > 1.0f) { + if (currentTime * frequency > 1.0f) { double d; - time = modf(time * frequency, &d) / frequency; + currentTime = modf(currentTime * frequency, &d) / frequency; } freq0 = frequency; } diff --git a/src/samples/controller/basic/Makefile.sample b/src/samples/controller/basic/Makefile.sample index 2981b5c3..10971a9c 100644 --- a/src/samples/controller/basic/Makefile.sample +++ b/src/samples/controller/basic/Makefile.sample @@ -2,7 +2,7 @@ TARGET = controller_basic OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/debug/debugkb/Makefile.sample b/src/samples/debug/debugkb/Makefile.sample index 1c9a382d..184e0e0b 100644 --- a/src/samples/debug/debugkb/Makefile.sample +++ b/src/samples/debug/debugkb/Makefile.sample @@ -3,7 +3,7 @@ OBJS = main.o LIBS = -lpspdebugkb INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/debug/exception/Makefile.sample b/src/samples/debug/exception/Makefile.sample index bea90d3d..40553ada 100644 --- a/src/samples/debug/exception/Makefile.sample +++ b/src/samples/debug/exception/Makefile.sample @@ -2,7 +2,7 @@ TARGET = exception OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/debug/gdb/Makefile.sample b/src/samples/debug/gdb/Makefile.sample index 7ef87a55..759314b2 100644 --- a/src/samples/debug/gdb/Makefile.sample +++ b/src/samples/debug/gdb/Makefile.sample @@ -1,10 +1,8 @@ TARGET = gdb OBJS = main.o -USE_PSPSDK_LIBC = 1 - INCDIR = -CFLAGS = -O0 -G0 -Wall -ggdb +CFLAGS = -O0 -Wall -ggdb CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/debug/kprintf/Makefile.sample b/src/samples/debug/kprintf/Makefile.sample index 55a31897..b1b7bdd4 100644 --- a/src/samples/debug/kprintf/Makefile.sample +++ b/src/samples/debug/kprintf/Makefile.sample @@ -2,7 +2,7 @@ TARGET = kptest OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/debug/profiler/Makefile.sample b/src/samples/debug/profiler/Makefile.sample index 15d52d81..10f1fe70 100644 --- a/src/samples/debug/profiler/Makefile.sample +++ b/src/samples/debug/profiler/Makefile.sample @@ -2,7 +2,7 @@ TARGET = profiler OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/debug/prxdecrypt/Makefile.sample b/src/samples/debug/prxdecrypt/Makefile.sample index 9cae73a9..63cb95dd 100644 --- a/src/samples/debug/prxdecrypt/Makefile.sample +++ b/src/samples/debug/prxdecrypt/Makefile.sample @@ -2,7 +2,7 @@ TARGET = prxdecrypt OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/debug/sio/Makefile.sample b/src/samples/debug/sio/Makefile.sample index 4902a6af..7b2ee297 100644 --- a/src/samples/debug/sio/Makefile.sample +++ b/src/samples/debug/sio/Makefile.sample @@ -1,10 +1,8 @@ TARGET = sio OBJS = main.o -USE_PSPSDK_LIBC = 1 - INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/exceptions/Makefile.sample b/src/samples/exceptions/Makefile.sample index 508cd52c..0c45b616 100644 --- a/src/samples/exceptions/Makefile.sample +++ b/src/samples/exceptions/Makefile.sample @@ -3,7 +3,7 @@ OBJS = main.o LIBS = -lstdc++ INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-rtti -fexceptions ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/beginobject/Makefile.sample b/src/samples/gu/beginobject/Makefile.sample index 99ff5e13..5eee8d7f 100644 --- a/src/samples/gu/beginobject/Makefile.sample +++ b/src/samples/gu/beginobject/Makefile.sample @@ -2,7 +2,7 @@ TARGET = beginobject OBJS = beginobject.o ../common/callbacks.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/blend/Makefile.sample b/src/samples/gu/blend/Makefile.sample index 74bfe8bd..b843ba13 100644 --- a/src/samples/gu/blend/Makefile.sample +++ b/src/samples/gu/blend/Makefile.sample @@ -2,7 +2,7 @@ TARGET = blend OBJS = blend.o ../common/callbacks.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/blit/Makefile.sample b/src/samples/gu/blit/Makefile.sample index 33d6e7af..03ae76ec 100644 --- a/src/samples/gu/blit/Makefile.sample +++ b/src/samples/gu/blit/Makefile.sample @@ -2,7 +2,7 @@ TARGET = blit OBJS = blit.o ../common/callbacks.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/celshading/Makefile.sample b/src/samples/gu/celshading/Makefile.sample index f9a03c79..ebb786ab 100644 --- a/src/samples/gu/celshading/Makefile.sample +++ b/src/samples/gu/celshading/Makefile.sample @@ -2,7 +2,7 @@ TARGET = celshading OBJS = lightmap.o celshading.o ../common/callbacks.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/clut/Makefile.sample b/src/samples/gu/clut/Makefile.sample index b6264686..891a2174 100644 --- a/src/samples/gu/clut/Makefile.sample +++ b/src/samples/gu/clut/Makefile.sample @@ -2,7 +2,7 @@ TARGET = clut OBJS = clut.o ../common/callbacks.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/clut/clut.c b/src/samples/gu/clut/clut.c index 143d748d..813d091f 100644 --- a/src/samples/gu/clut/clut.c +++ b/src/samples/gu/clut/clut.c @@ -184,7 +184,7 @@ int SetupCallbacks(void) { int thid = 0; - thid = sceKernelCreateThread("update_thread", CallbackThread, 0x11, 0xFA0, 0, 0); + thid = sceKernelCreateThread("update_thread", CallbackThread, 0x18, 0xFA0, 0, 0); if(thid >= 0) { sceKernelStartThread(thid, 0, 0); diff --git a/src/samples/gu/copy/Makefile.sample b/src/samples/gu/copy/Makefile.sample index 9b18b72c..341fb698 100644 --- a/src/samples/gu/copy/Makefile.sample +++ b/src/samples/gu/copy/Makefile.sample @@ -2,7 +2,7 @@ TARGET = copy OBJS = copy.o ../common/callbacks.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/cube/Makefile.sample b/src/samples/gu/cube/Makefile.sample index f133de7c..f9d0019f 100644 --- a/src/samples/gu/cube/Makefile.sample +++ b/src/samples/gu/cube/Makefile.sample @@ -2,7 +2,7 @@ TARGET = cube OBJS = cube.o logo.o ../common/callbacks.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall +CFLAGS = -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/envmap/Makefile.sample b/src/samples/gu/envmap/Makefile.sample index 8d638a74..24dc111c 100644 --- a/src/samples/gu/envmap/Makefile.sample +++ b/src/samples/gu/envmap/Makefile.sample @@ -2,7 +2,7 @@ TARGET = envmap OBJS = envmap.o env0.o ../common/callbacks.o ../common/geometry.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/integerdrawing/Makefile.sample b/src/samples/gu/integerdrawing/Makefile.sample index ef7a979f..f87459bc 100644 --- a/src/samples/gu/integerdrawing/Makefile.sample +++ b/src/samples/gu/integerdrawing/Makefile.sample @@ -2,7 +2,7 @@ TARGET = integerdrawing OBJS = integerdrawing.o ../common/callbacks.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/lights/Makefile.sample b/src/samples/gu/lights/Makefile.sample index f63a4349..7a7c454e 100644 --- a/src/samples/gu/lights/Makefile.sample +++ b/src/samples/gu/lights/Makefile.sample @@ -2,7 +2,7 @@ TARGET = lights OBJS = lights.o ../common/callbacks.o ../common/geometry.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/lines/Makefile.sample b/src/samples/gu/lines/Makefile.sample index 88ebb84f..d90ecfd8 100644 --- a/src/samples/gu/lines/Makefile.sample +++ b/src/samples/gu/lines/Makefile.sample @@ -2,7 +2,7 @@ TARGET = lines OBJS = lines.o ../common/callbacks.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/logic/Makefile.sample b/src/samples/gu/logic/Makefile.sample index e1509de8..6e83aaeb 100644 --- a/src/samples/gu/logic/Makefile.sample +++ b/src/samples/gu/logic/Makefile.sample @@ -2,7 +2,7 @@ TARGET = logic OBJS = logic.o ../common/callbacks.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/mipmapping/Makefile.sample b/src/samples/gu/mipmapping/Makefile.sample index 0df7ff44..cba00aa0 100644 --- a/src/samples/gu/mipmapping/Makefile.sample +++ b/src/samples/gu/mipmapping/Makefile.sample @@ -2,7 +2,7 @@ TARGET = MIPMAPPING OBJS = mipmapping.o mip0.o mip1.o mip2.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/morph/Makefile.sample b/src/samples/gu/morph/Makefile.sample index e731b91a..b26528cf 100644 --- a/src/samples/gu/morph/Makefile.sample +++ b/src/samples/gu/morph/Makefile.sample @@ -2,7 +2,7 @@ TARGET = morph OBJS = morph.o INCDIR = -CFLAGS = -G0 -Wall +CFLAGS = -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/morphskin/Makefile.sample b/src/samples/gu/morphskin/Makefile.sample index c902d1e7..c979c7f1 100644 --- a/src/samples/gu/morphskin/Makefile.sample +++ b/src/samples/gu/morphskin/Makefile.sample @@ -2,7 +2,7 @@ TARGET = morphskin OBJS = morphskin.o INCDIR = -CFLAGS = -G0 -Wall +CFLAGS = -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/ortho/Makefile.sample b/src/samples/gu/ortho/Makefile.sample index db58974c..dc3f7994 100644 --- a/src/samples/gu/ortho/Makefile.sample +++ b/src/samples/gu/ortho/Makefile.sample @@ -4,7 +4,7 @@ PSPDIR=$(shell psp-config --psp-prefix) TARGET = ortho OBJS = ortho.o ../common/callbacks.o ../common/vram.o -CFLAGS = -O2 -G0 -Wall -g +CFLAGS = -O2 -Wall -g CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/reflection/Makefile.sample b/src/samples/gu/reflection/Makefile.sample index beeb0f31..faad763c 100644 --- a/src/samples/gu/reflection/Makefile.sample +++ b/src/samples/gu/reflection/Makefile.sample @@ -2,7 +2,7 @@ TARGET = reflection OBJS = reflection.o logo.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/rendertarget/Makefile.sample b/src/samples/gu/rendertarget/Makefile.sample index abfd9113..544ebc44 100644 --- a/src/samples/gu/rendertarget/Makefile.sample +++ b/src/samples/gu/rendertarget/Makefile.sample @@ -2,7 +2,7 @@ TARGET = rendertarget OBJS = rendertarget.o INCDIR = -CFLAGS = -G0 -Wall +CFLAGS = -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/shadowprojection/Makefile.sample b/src/samples/gu/shadowprojection/Makefile.sample index 143e1575..d18f4b56 100644 --- a/src/samples/gu/shadowprojection/Makefile.sample +++ b/src/samples/gu/shadowprojection/Makefile.sample @@ -2,7 +2,7 @@ TARGET = shadowprojection OBJS = shadowprojection.o INCDIR = -CFLAGS = -G0 -Wall +CFLAGS = -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/signals/Makefile.sample b/src/samples/gu/signals/Makefile.sample index 74cb7aa7..e4b8f026 100644 --- a/src/samples/gu/signals/Makefile.sample +++ b/src/samples/gu/signals/Makefile.sample @@ -2,7 +2,7 @@ TARGET = signals OBJS = signals.o ball.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/skinning/Makefile.sample b/src/samples/gu/skinning/Makefile.sample index d8f536cf..b59f6830 100644 --- a/src/samples/gu/skinning/Makefile.sample +++ b/src/samples/gu/skinning/Makefile.sample @@ -2,7 +2,7 @@ TARGET = skinning OBJS = skinning.o INCDIR = -CFLAGS = -G0 -Wall +CFLAGS = -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) @@ -14,5 +14,4 @@ EXTRA_TARGETS = EBOOT.PBP PSP_EBOOT_TITLE = Matrix Skinning Sample PSPSDK=$(shell psp-config --pspsdk-path) -USE_PSPSDK_LIBC=1 include $(PSPSDK)/lib/build.mak \ No newline at end of file diff --git a/src/samples/gu/speed/Makefile.sample b/src/samples/gu/speed/Makefile.sample index 54a2685e..df1b4382 100644 --- a/src/samples/gu/speed/Makefile.sample +++ b/src/samples/gu/speed/Makefile.sample @@ -2,7 +2,7 @@ TARGET = speed OBJS = speed.o ../common/callbacks.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/spharm/Makefile.sample b/src/samples/gu/spharm/Makefile.sample index 72a613de..64ec8e69 100644 --- a/src/samples/gu/spharm/Makefile.sample +++ b/src/samples/gu/spharm/Makefile.sample @@ -2,7 +2,7 @@ TARGET = spharm OBJS = cube.o spharm.o disablefpu.o mt19937.o logo.o logo2.o logo3.o INCDIR = -CFLAGS = -G0 -Wall -fno-exceptions +CFLAGS = -Wall -fno-exceptions CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/splinesurface/Makefile.sample b/src/samples/gu/splinesurface/Makefile.sample index 06908520..4b81593f 100644 --- a/src/samples/gu/splinesurface/Makefile.sample +++ b/src/samples/gu/splinesurface/Makefile.sample @@ -2,7 +2,7 @@ TARGET = splinesurface OBJS = splinesurface.o ../common/callbacks.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall +CFLAGS = -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/sprite/Makefile.sample b/src/samples/gu/sprite/Makefile.sample index e2021f43..fea6d96d 100644 --- a/src/samples/gu/sprite/Makefile.sample +++ b/src/samples/gu/sprite/Makefile.sample @@ -2,7 +2,7 @@ TARGET = sprite OBJS = sprite.o ball.o ../common/callbacks.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/text/Makefile.sample b/src/samples/gu/text/Makefile.sample index be7c4555..9bb3910e 100644 --- a/src/samples/gu/text/Makefile.sample +++ b/src/samples/gu/text/Makefile.sample @@ -2,7 +2,7 @@ TARGET = gufont OBJS = font.c main.o INCDIR = -CFLAGS = -G0 -Wall -O2 +CFLAGS = -Wall -O2 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/timing/Makefile.sample b/src/samples/gu/timing/Makefile.sample index 1414f729..d762998a 100644 --- a/src/samples/gu/timing/Makefile.sample +++ b/src/samples/gu/timing/Makefile.sample @@ -2,7 +2,7 @@ TARGET = timing OBJS = timing.o INCDIR = -CFLAGS = -G0 -Wall +CFLAGS = -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/vertex/Makefile.sample b/src/samples/gu/vertex/Makefile.sample index 46fc1ee9..9e73ff98 100644 --- a/src/samples/gu/vertex/Makefile.sample +++ b/src/samples/gu/vertex/Makefile.sample @@ -2,7 +2,7 @@ TARGET = vertex OBJS = vertex.o ../common/callbacks.o ../common/vram.o ../common/menu.o INCDIR = -CFLAGS = -G0 -Wall +CFLAGS = -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/zbufferfog/Makefile.sample b/src/samples/gu/zbufferfog/Makefile.sample index acd19a17..219fed63 100644 --- a/src/samples/gu/zbufferfog/Makefile.sample +++ b/src/samples/gu/zbufferfog/Makefile.sample @@ -2,7 +2,7 @@ TARGET = zbufferfog OBJS = zbufferfog.o ../common/callbacks.o ../common/geometry.o ../common/vram.o INCDIR = -CFLAGS = -G0 -Wall +CFLAGS = -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/ir/irda/Makefile.sample b/src/samples/ir/irda/Makefile.sample index bb2ef5c8..5b6d8028 100644 --- a/src/samples/ir/irda/Makefile.sample +++ b/src/samples/ir/irda/Makefile.sample @@ -2,7 +2,7 @@ TARGET = irda OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/ir/sircs/Makefile.sample b/src/samples/ir/sircs/Makefile.sample index dce8d4f1..ed9b7763 100644 --- a/src/samples/ir/sircs/Makefile.sample +++ b/src/samples/ir/sircs/Makefile.sample @@ -2,7 +2,7 @@ TARGET = sircs OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/cwd/Makefile.sample b/src/samples/kernel/cwd/Makefile.sample index 8034da8a..dd44a5c1 100644 --- a/src/samples/kernel/cwd/Makefile.sample +++ b/src/samples/kernel/cwd/Makefile.sample @@ -2,7 +2,7 @@ TARGET = cwd OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/cwd/main.c b/src/samples/kernel/cwd/main.c index 7ba640c9..c39f84f2 100644 --- a/src/samples/kernel/cwd/main.c +++ b/src/samples/kernel/cwd/main.c @@ -22,6 +22,7 @@ #include #include #include +#include PSP_MODULE_INFO("CwdTest", 0, 1, 1); diff --git a/src/samples/kernel/fileio/Makefile.sample b/src/samples/kernel/fileio/Makefile.sample index 898ba9bc..ee3895fc 100644 --- a/src/samples/kernel/fileio/Makefile.sample +++ b/src/samples/kernel/fileio/Makefile.sample @@ -2,7 +2,7 @@ TARGET = dumper OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/idstorage/Makefile.sample b/src/samples/kernel/idstorage/Makefile.sample index e9fbfa64..ee7ce2f2 100644 --- a/src/samples/kernel/idstorage/Makefile.sample +++ b/src/samples/kernel/idstorage/Makefile.sample @@ -1,7 +1,7 @@ TARGET = idstorage OBJS = main.o -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/kdumper/Makefile.sample b/src/samples/kernel/kdumper/Makefile.sample index 447bc4f2..799fcf0c 100644 --- a/src/samples/kernel/kdumper/Makefile.sample +++ b/src/samples/kernel/kdumper/Makefile.sample @@ -2,7 +2,7 @@ TARGET = kdumper OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/loadmodule/Makefile.sample b/src/samples/kernel/loadmodule/Makefile.sample index 87a5b2f0..513b9ddf 100644 --- a/src/samples/kernel/loadmodule/Makefile.sample +++ b/src/samples/kernel/loadmodule/Makefile.sample @@ -2,7 +2,7 @@ TARGET = loadmodule OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/messagebox/Makefile.sample b/src/samples/kernel/messagebox/Makefile.sample index b97fbece..97249627 100644 --- a/src/samples/kernel/messagebox/Makefile.sample +++ b/src/samples/kernel/messagebox/Makefile.sample @@ -2,7 +2,7 @@ TARGET = messagebox OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/regenum/Makefile.sample b/src/samples/kernel/regenum/Makefile.sample index 594f1e67..82ff3591 100644 --- a/src/samples/kernel/regenum/Makefile.sample +++ b/src/samples/kernel/regenum/Makefile.sample @@ -2,7 +2,7 @@ TARGET = regsh OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/registry/Makefile.sample b/src/samples/kernel/registry/Makefile.sample index 9b4cf337..fb6b7ae6 100644 --- a/src/samples/kernel/registry/Makefile.sample +++ b/src/samples/kernel/registry/Makefile.sample @@ -2,7 +2,7 @@ TARGET = regsample OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/sysevent/Makefile.sample b/src/samples/kernel/sysevent/Makefile.sample index 6bd2a415..b51c1466 100644 --- a/src/samples/kernel/sysevent/Makefile.sample +++ b/src/samples/kernel/sysevent/Makefile.sample @@ -2,7 +2,7 @@ TARGET = sysevent OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/systimer/Makefile.sample b/src/samples/kernel/systimer/Makefile.sample index 7575de95..fc4030f0 100644 --- a/src/samples/kernel/systimer/Makefile.sample +++ b/src/samples/kernel/systimer/Makefile.sample @@ -2,7 +2,7 @@ TARGET = systimer OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/kernel/threadstatus/Makefile.sample b/src/samples/kernel/threadstatus/Makefile.sample index 833420f4..d123183b 100644 --- a/src/samples/kernel/threadstatus/Makefile.sample +++ b/src/samples/kernel/threadstatus/Makefile.sample @@ -2,7 +2,7 @@ TARGET = threadstatus OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/me/basic/Makefile.sample b/src/samples/me/basic/Makefile.sample index 7f00e2a1..166b4bcb 100644 --- a/src/samples/me/basic/Makefile.sample +++ b/src/samples/me/basic/Makefile.sample @@ -2,7 +2,7 @@ TARGET = mebasic OBJS = main.o me.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/mp3/Makefile.sample b/src/samples/mp3/Makefile.sample index 724ad16c..702dbad3 100644 --- a/src/samples/mp3/Makefile.sample +++ b/src/samples/mp3/Makefile.sample @@ -6,7 +6,7 @@ LIBS = -lpspaudio -lpspmp3 BUILD_PRX = 1 -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/ms/callback/Makefile.sample b/src/samples/ms/callback/Makefile.sample index 880b3275..945b5e77 100644 --- a/src/samples/ms/callback/Makefile.sample +++ b/src/samples/ms/callback/Makefile.sample @@ -4,7 +4,7 @@ OBJS = main.o BUILD_PRX=1 INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/net/resolver/Makefile.sample b/src/samples/net/resolver/Makefile.sample index dc6979cd..338effce 100644 --- a/src/samples/net/resolver/Makefile.sample +++ b/src/samples/net/resolver/Makefile.sample @@ -2,7 +2,7 @@ TARGET = resolver OBJS = main.o INCDIR = -CFLAGS = -O0 -G0 -Wall -g +CFLAGS = -O0 -Wall -g CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/net/simple/Makefile.sample b/src/samples/net/simple/Makefile.sample index eaeed2ef..77588e5d 100644 --- a/src/samples/net/simple/Makefile.sample +++ b/src/samples/net/simple/Makefile.sample @@ -2,7 +2,7 @@ TARGET = netsample OBJS = main.o INCDIR = -CFLAGS = -O0 -G0 -Wall -g +CFLAGS = -O0 -Wall -g CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/net/simple_prx/Makefile.sample b/src/samples/net/simple_prx/Makefile.sample index e2757024..d25604fb 100644 --- a/src/samples/net/simple_prx/Makefile.sample +++ b/src/samples/net/simple_prx/Makefile.sample @@ -5,7 +5,7 @@ PRX_EXPORTS=exports.exp BUILD_PRX=1 INCDIR = -CFLAGS = -O0 -G0 -Wall -g +CFLAGS = -O0 -Wall -g CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/net/wlanscan/Makefile.sample b/src/samples/net/wlanscan/Makefile.sample index 2e5a41d8..9b6de89e 100644 --- a/src/samples/net/wlanscan/Makefile.sample +++ b/src/samples/net/wlanscan/Makefile.sample @@ -4,7 +4,7 @@ OBJS = main.o BUILD_PRX=1 INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/net/wlanscan_elf/Makefile.sample b/src/samples/net/wlanscan_elf/Makefile.sample index f220a0f6..1881ca39 100644 --- a/src/samples/net/wlanscan_elf/Makefile.sample +++ b/src/samples/net/wlanscan_elf/Makefile.sample @@ -2,7 +2,7 @@ TARGET = wlanscan OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/power/Makefile.sample b/src/samples/power/Makefile.sample index ac3a69a5..72484f51 100644 --- a/src/samples/power/Makefile.sample +++ b/src/samples/power/Makefile.sample @@ -1,12 +1,12 @@ PSPSDK = $(shell psp-config --pspsdk-path) PSPLIBSDIR = $(PSPSDK)/.. TARGET = powersample -OBJS = main.o +OBJS = main.o LIBS = -lpsppower -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) -include $(PSPSDK)/lib/build.mak +include $(PSPSDK)/lib/build.mak diff --git a/src/samples/prx/prx_loader/Makefile.sample b/src/samples/prx/prx_loader/Makefile.sample index f8e5a4b5..3ec72090 100644 --- a/src/samples/prx/prx_loader/Makefile.sample +++ b/src/samples/prx/prx_loader/Makefile.sample @@ -1,10 +1,8 @@ TARGET = prxloader OBJS = main.o MyLib.o -USE_PSPSDK_LIBC = 1 - INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/prx/testprx/Makefile.sample b/src/samples/prx/testprx/Makefile.sample index 6bf81847..df2bbfe8 100644 --- a/src/samples/prx/testprx/Makefile.sample +++ b/src/samples/prx/testprx/Makefile.sample @@ -6,10 +6,8 @@ BUILD_PRX=1 # Define the name of our custom exports (minus the .exp extension) PRX_EXPORTS=exports.exp -USE_PSPSDK_LIBC = 1 - INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/savedata/decrypt/Makefile.sample b/src/samples/savedata/decrypt/Makefile.sample index c75dd769..87cd54f0 100644 --- a/src/samples/savedata/decrypt/Makefile.sample +++ b/src/samples/savedata/decrypt/Makefile.sample @@ -2,7 +2,7 @@ TARGET = main OBJS = main.o decrypt.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/savedata/encrypt/Makefile.sample b/src/samples/savedata/encrypt/Makefile.sample index 8a4b43a8..7cb1d013 100644 --- a/src/samples/savedata/encrypt/Makefile.sample +++ b/src/samples/savedata/encrypt/Makefile.sample @@ -2,7 +2,7 @@ TARGET = main OBJS = main.o encrypt.o hash.o psf.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/savedata/encrypt/psf.c b/src/samples/savedata/encrypt/psf.c index d9197692..271a9822 100644 --- a/src/samples/savedata/encrypt/psf.c +++ b/src/samples/savedata/encrypt/psf.c @@ -75,7 +75,7 @@ int find_psf_section(const char *name, && (sectBufLen < dataLen) && (sectBufLoc < dataLen)) { /* Check if this is the section we want */ - if (!stricmp((char *)&data[strLoc + nameLoc], name)) + if (!strcasecmp((char *)&data[strLoc + nameLoc], name)) { /* Update the location and size */ *location = &data[headLen + sectBufLoc]; diff --git a/src/samples/savedata/utility/Makefile.sample b/src/samples/savedata/utility/Makefile.sample index 637743d0..93404bbf 100644 --- a/src/samples/savedata/utility/Makefile.sample +++ b/src/samples/savedata/utility/Makefile.sample @@ -5,7 +5,7 @@ OBJS = main.o #PSP_FW_VERSION = 200 #BUILD_PRX = 1 -LIBS = -lpsputility -lpspgum -lpspgu -lm +LIBS = -lpspgum -lpspgu CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti diff --git a/src/samples/template/elf_template/Makefile.sample b/src/samples/template/elf_template/Makefile.sample index 9bd56434..0c3705d5 100644 --- a/src/samples/template/elf_template/Makefile.sample +++ b/src/samples/template/elf_template/Makefile.sample @@ -2,7 +2,7 @@ TARGET = template OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/template/kprx_template/Makefile.sample b/src/samples/template/kprx_template/Makefile.sample index eb3e1035..8f56bbf2 100644 --- a/src/samples/template/kprx_template/Makefile.sample +++ b/src/samples/template/kprx_template/Makefile.sample @@ -1,13 +1,11 @@ TARGET = ktemplate OBJS = main.o -# Use the kernel's small inbuilt libc -USE_KERNEL_LIBC = 1 # Use only kernel libraries USE_KERNEL_LIBS = 1 INCDIR = -CFLAGS = -O2 -G0 -Wall -fno-builtin-printf +CFLAGS = -O2 -Wall -fno-builtin-printf CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/template/lib_template/Makefile.sample b/src/samples/template/lib_template/Makefile.sample index 81a901a3..1ae17d47 100644 --- a/src/samples/template/lib_template/Makefile.sample +++ b/src/samples/template/lib_template/Makefile.sample @@ -2,7 +2,7 @@ TARGET_LIB = libtemplate.a OBJS = template.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/template/prx_template/Makefile.sample b/src/samples/template/prx_template/Makefile.sample index add22c49..bb379eef 100644 --- a/src/samples/template/prx_template/Makefile.sample +++ b/src/samples/template/prx_template/Makefile.sample @@ -4,7 +4,7 @@ OBJS = main.o BUILD_PRX=1 INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/usb/storage/Makefile.sample b/src/samples/usb/storage/Makefile.sample index d7fcb8ba..9ab5f7fe 100644 --- a/src/samples/usb/storage/Makefile.sample +++ b/src/samples/usb/storage/Makefile.sample @@ -3,7 +3,7 @@ PSPLIBSDIR = $(PSPSDK)/.. TARGET = usbstorage OBJS = main.o LIBS = -lpspusb -lpspusbstor -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/utility/gamesharing/Makefile.sample b/src/samples/utility/gamesharing/Makefile.sample index 530b924d..9d482e6e 100644 --- a/src/samples/utility/gamesharing/Makefile.sample +++ b/src/samples/utility/gamesharing/Makefile.sample @@ -4,14 +4,14 @@ OBJS = main.o PSP_FW_VERSION = 200 BUILD_PRX = 1 -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) LIBDIR = LDFLAGS = -LIBS = -lpsputility -lpspgum -lpspgu -lm -lpspnet_adhoc -lpspnet_adhocctl -lpspnet_adhocmatching +LIBS = -lpspgum -lpspgu -lpspnet_adhoc -lpspnet_adhocctl -lpspnet_adhocmatching EXTRA_TARGETS = EBOOT.PBP PSP_EBOOT_TITLE = Game Sharing Sample diff --git a/src/samples/utility/htmlviewer/Makefile.sample b/src/samples/utility/htmlviewer/Makefile.sample index 4750f53f..3c43209a 100644 --- a/src/samples/utility/htmlviewer/Makefile.sample +++ b/src/samples/utility/htmlviewer/Makefile.sample @@ -2,7 +2,7 @@ TARGET = htmlsample OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) @@ -11,7 +11,7 @@ EXTRA_TARGETS = EBOOT.PBP LIBDIR = LDFLAGS = -LIBS = -lpsputility -lpsphttp -lpspssl -lpspgum -lpspgu -lm +LIBS = -lpsphttp -lpspssl -lpspgum -lpspgu PSPSDK=$(shell psp-config --pspsdk-path) include $(PSPSDK)/lib/build.mak diff --git a/src/samples/utility/msgdialog/Makefile.sample b/src/samples/utility/msgdialog/Makefile.sample index 6fa68b17..ca5a6729 100644 --- a/src/samples/utility/msgdialog/Makefile.sample +++ b/src/samples/utility/msgdialog/Makefile.sample @@ -2,12 +2,12 @@ PSPSDK = $(shell psp-config --pspsdk-path) PSPLIBSDIR = $(PSPSDK)/.. TARGET = msgdialogsample OBJS = main.o -LIBS = -lpsputility -lpspgum -lpspgu -lm +LIBS = -lpspgum -lpspgu # Uncomment the following line to comple for custom firmware 3.xx #BUILD_PRX = 1 -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/utility/netconf/Makefile.sample b/src/samples/utility/netconf/Makefile.sample index b6c25a2e..775242d8 100644 --- a/src/samples/utility/netconf/Makefile.sample +++ b/src/samples/utility/netconf/Makefile.sample @@ -2,10 +2,9 @@ PSPSDK = $(shell psp-config --pspsdk-path) PSPLIBSDIR = $(PSPSDK)/.. TARGET = netconfsample OBJS = main.o -LIBS = -lpsputility -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/utility/netdialog/Makefile.sample b/src/samples/utility/netdialog/Makefile.sample index 7ec76b2f..baca5c7b 100644 --- a/src/samples/utility/netdialog/Makefile.sample +++ b/src/samples/utility/netdialog/Makefile.sample @@ -6,14 +6,14 @@ PSP_FW_VERSION = 200 BUILD_PRX = 1 -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) LIBDIR = LDFLAGS = -LIBS = -lpsputility -lpspgum -lpspgu -lm +LIBS = -lpspgum -lpspgu EXTRA_TARGETS = EBOOT.PBP PSP_EBOOT_TITLE = Net Dialog Sample diff --git a/src/samples/utility/osk/Makefile.sample b/src/samples/utility/osk/Makefile.sample index 26a37d3d..f9a7095a 100644 --- a/src/samples/utility/osk/Makefile.sample +++ b/src/samples/utility/osk/Makefile.sample @@ -2,7 +2,7 @@ TARGET = osk OBJS = main.o INCDIR = -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) @@ -10,7 +10,7 @@ BUILD_PRX = 1 LIBDIR = LDFLAGS = -LIBS = -lpspgu -lpsputility +LIBS = -lpspgu EXTRA_TARGETS = EBOOT.PBP PSP_EBOOT_TITLE = PSP OSK Sample diff --git a/src/samples/utility/systemparam/Makefile.sample b/src/samples/utility/systemparam/Makefile.sample index fb34d5f5..8a7ff243 100644 --- a/src/samples/utility/systemparam/Makefile.sample +++ b/src/samples/utility/systemparam/Makefile.sample @@ -1,12 +1,11 @@ PSPSDK = $(shell psp-config --pspsdk-path) PSPLIBSDIR = $(PSPSDK)/.. TARGET = sysparamsample -OBJS = main.o -LIBS = -lpsputility +OBJS = main.o -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) -include $(PSPSDK)/lib/build.mak +include $(PSPSDK)/lib/build.mak diff --git a/src/samples/wlan/Makefile.sample b/src/samples/wlan/Makefile.sample index 21ddac85..01ffd87c 100644 --- a/src/samples/wlan/Makefile.sample +++ b/src/samples/wlan/Makefile.sample @@ -5,7 +5,7 @@ OBJS = main.o LIBS = -lpspwlan -CFLAGS = -O2 -G0 -Wall +CFLAGS = -O2 -Wall CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS)