Platform Makefile Cleanup

projects/Makefile.BEAGLEBOARD

@@ -1,19 +1,23 @@
 -include $(PWD)/rules_base
 
-%.beagle-exe: $(OFILES)
-	$(CXX) $(LDFLAGS) $@ $(OFILES) $(LIBS)
+DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
+	-DCPP_MEMORY \
+	-DDEBUG \
+	-D__LINUX_ALSA__ \
+	-D_NO_JACK_  
 
 DEVKIT=/usr/local/angstrom/arm
 
 TOOLPATH=$(DEVKIT)/bin
 PREFIX		:=	arm-angstrom-linux-gnueabi-
 
 SDLBASE:= /home/nostromo/devtree/syntharchitecture/Libs/Beagleboard/SDL/
-CFLAGS	:= -I$(SDLBASE)/include	 -DDEBUG -O3 -Wall -DPLATFORM_$(PLATFORM) -I$(PWD)/../sources -D__LINUX_ALSA__  -DCPP_MEMORY -D_NO_JACK_
-
+CFLAGS	:= -I$(SDLBASE)/include	$(DEFINES) -O3 -Wall -I$(PWD)/../sources
 CXXFLAGS:=	$(CFLAGS)
-
-EXTENSION:= beagle-exe
-
 LIBS	:=  -L$(SDLBASE)/lib -L/opt/mipsel-linux-uclibc/usr/lib -lSDL -ldirectfb -lasound -lpthread -ldl -lts
 LIBDIRS	:=	$(DEKVIT)/usr/lib
+EXTENSION:= beagle-exe
+
+%.beagle-exe: $(OFILES)
+	$(CXX) $(LDFLAGS) $@ $(OFILES) $(LIBS)

projects/Makefile.BITTBOY

@@ -1,34 +1,36 @@
 -include $(PWD)/rules_base
 STRIP = $(CROSS_COMPILE)strip
 
-%.elf: $(OFILES)
-	$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
-	@$(STRIP) $@
+DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
+	-DBUFFERED \
+	-DCPP_MEMORY \
+	-DHAVE_STDINT_H \
+	-D_NDEBUG \
+	-D__LINUX_ALSA__ \
+	-D_NO_JACK_
 
 DEVKIT=/opt/arm-buildroot-linux-musleabi_sdk-buildroot
 CROSS_COMPILE=$(DEVKIT)/bin/arm-buildroot-linux-musleabi-
-
 CC = $(CROSS_COMPILE)gcc
 CXX = $(CROSS_COMPILE)g++
 SYSROOT     := $(shell $(CROSS_COMPILE)gcc --print-sysroot)
 SDL_CFLAGS  := $(shell $(SYSROOT)/usr/bin/sdl-config --cflags)
 SDL_LIBS    := $(shell $(SYSROOT)/usr/bin/sdl-config --libs)
-
-DEFINES = -DHAVE_STDINT_H -D_NDEBUG -D_NO_JACK_ -I$(PWD)/../sources -D__LINUX_ALSA__ -DCPP_MEMORY $(SDL_CFLAGS) $(SDL_LIBS) -DBUFFERED
-INCLUDES = -Iinclude $(SDL_CFLAGS)
-OPT_FLAGS  = -O3 -Ofast
-
-OUTPUT = ../lgpt-bittboy
+SDL_BASE = $(DEVKIT)/arm-buildroot-linux-musleabi/sysroot/usr/bin/
 
 TOOLPATH=$(DEVKIT)/usr/bin
 PREFIX		:=	arm-linux-
-SDL_BASE = $(DEVKIT)/arm-buildroot-linux-musleabi/sysroot/usr/bin/
-
-CFLAGS	:=	$(DEFINES) $(INCLUDES) $(OPT_FLAGS) -Wall -DRS97
 
+OPT_FLAGS  = -O3 -Ofast
+INCLUDES = -I$(PWD)/../sources -Iinclude $(SDL_CFLAGS)
+CFLAGS	:=	$(DEFINES) $(INCLUDES) $(OPT_FLAGS) $(SDL_CFLAGS) -Wall -DRS97
 CXXFLAGS:=	$(CFLAGS) -std=gnu++03
-
+LIBS	:=	$(SDL_LIBS) -lSDL -lSDL_mixer -lasound -lpthread
+LIBDIRS	:=	$(DEKVIT)/usr/lib
+OUTPUT = ../lgpt-bittboy
 EXTENSION:= elf
 
-LIBS	:=  -lSDL -lSDL_mixer -lasound -lpthread
-LIBDIRS	:=	$(DEKVIT)/usr/lib
+%.elf: $(OFILES)
+	$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
+	@$(STRIP) $@

projects/Makefile.CAANOO

@@ -1,21 +1,22 @@
 -include $(PWD)/rules_base
 
-STRIP = arm-gph-linux-gnueabi-strip
-
-%.gpe: $(OFILES)
-	$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
-	@$(STRIP) $@
+DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
+	-DCPP_MEMORY \
+	-DNDEBUG \
+	-D__LINUX_OSS__
 
 DEVKITARM=/home/nostromo/caanoodev/gcc-4.2.4-glibc-2.7-eabi/
-
 PREFIX		:=	arm-gph-linux-gnueabi-
+STRIP = arm-gph-linux-gnueabi-strip
 
-CFLAGS	:= -O3 -DNDEBUG -Wall -DCPP_MEMORY -DPLATFORM_$(PLATFORM) -I$(PWD)/../sources -D__LINUX_OSS__ 
-
+CFLAGS	:= -O3  -Wall $(DEFINES) -I$(PWD)/../sources  
 CXXFLAGS:=	$(CFLAGS)
-
+LIBS	:=  -L/c/GPH_SDK/tools/cross-eabi/arm-gph-linux-gnueabi/sys-root/ -L/c/GPH_SDK/tools/cross-eabi/arm-gph-linux-gnueabi/sys-root/lib -L/c/GPH_SDK/tools/cross-eabi/arm-gph-linux-gnueabi/sys-root/usr/lib -lSDL 
+LIBDIRS	:=	$(DEKVITARM)/lib
 EXTENSION:= gpe
 
-LIBS	:=  -L/c/GPH_SDK/tools/cross-eabi/arm-gph-linux-gnueabi/sys-root/ -L/c/GPH_SDK/tools/cross-eabi/arm-gph-linux-gnueabi/sys-root/lib -L/c/GPH_SDK/tools/cross-eabi/arm-gph-linux-gnueabi/sys-root/usr/lib -lSDL 
+%.gpe: $(OFILES)
+	$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
+	@$(STRIP) $@
 
-LIBDIRS	:=	$(DEKVITARM)/lib

projects/Makefile.DEB

@@ -2,6 +2,7 @@
 
 # config
 DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
 	-DCPP_MEMORY \
 	-D_DEBUG \
 	-D__LINUX_ALSA__ \

projects/Makefile.DINGOO

@@ -1,21 +1,24 @@
 -include $(PWD)/rules_base
-STRIP = ls
 
-%.dge: $(OFILES)
-	$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
-	@$(STRIP) $@
+DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
+	-DCPP_MEMORY \
+	-D_DEBUG \
+	-D__LINUX_ALSA__  
 
 DEVKIT=/opt/mipsel-linux-uclibc
 
 TOOLPATH=$(DEVKIT)/usr/bin
 PREFIX		:=	mipsel-linux-
+STRIP = ls
 SDL_BASE = /opt/mipsel-linux-uclibc/usr/bin/
 
-CFLAGS	:=	`$(SDL_BASE)sdl-config --cflags` -O3 -D_DEBUG -Wall -DPLATFORM_$(PLATFORM) -I$(PWD)/../sources -D__LINUX_ALSA__  -DCPP_MEMORY
-
+CFLAGS	:=	`$(SDL_BASE)sdl-config --cflags` -O3 -Wall $(DEFINES) -I$(PWD)/../sources 
 CXXFLAGS:=	$(CFLAGS)
-
-EXTENSION:= dge
-
 LIBS	:=  -L/opt/mipsel-linux-uclibc/usr/lib -lSDL -lpthread 
 LIBDIRS	:=	$(DEKVIT)/usr/lib
+EXTENSION:= dge
+
+%.dge: $(OFILES)
+	$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
+	@$(STRIP) $@

projects/Makefile.GARLIC

@@ -1,7 +1,7 @@
 -include $(PWD)/rules_base
-STRIP = $(CROSS_COMPILE)strip
 
 DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
 	-DBUFFERED \
 	-DCPP_MEMORY \
 	-D_NDEBUG \
@@ -10,6 +10,7 @@ DEFINES := \
 
 DEVKIT = /opt/miyoo/
 CROSS_COMPILE=$(DEVKIT)bin/arm-miyoo-linux-uclibcgnueabi-
+STRIP = $(CROSS_COMPILE)strip
 CC = $(CROSS_COMPILE)gcc
 CXX = $(CROSS_COMPILE)g++
 TOOLPATH=$(DEVKIT)/usr/bin

projects/Makefile.GARLICPLUS

@@ -4,6 +4,7 @@ STRIP = $(CROSS_COMPILE)strip
 export LD_LIBRARY_PATH = $LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/opt/rg35xxplus-toolchain/usr/lib
 
 DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
 	-DBUFFERED \
 	-DCPP_MEMORY \
 	-D_NDEBUG \

projects/Makefile.GP2X

@@ -1,25 +1,24 @@
 -include $(PWD)/rules_base
-STRIP = arm-linux-strip
 
-%.gpe: $(OFILES)
-	$(CXX) -static $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
-	@$(STRIP) $@
+DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
+	-DCPP_MEMORY \
+	-DNDEBUG \
+	-D__LINUX_OSS__
 
 DEVKITARM=/c/devkitGP2X
-
 DEVKITPRO=$(DEVKITARM)/..
-
+STRIP = arm-linux-strip
 TOOLPATH=$(DEVKITARM)/bin
 PREFIX		:=	arm-linux-
 SDL_BASE = C:/devkitGP2X/bin/arm-linux-
 
-CFLAGS	:=	`$(SDL_BASE)sdl-config --cflags` -DNDEBUG -O2 -Wall -DCPP_MEMORY -DPLATFORM_$(PLATFORM) -I$(PWD)/../sources -D__LINUX_OSS__ 
-
+CFLAGS	:=	$(DEFINES) `$(SDL_BASE)sdl-config --cflags` -O2 -Wall -I$(PWD)/../sources 
 CXXFLAGS:=	$(CFLAGS)
-
-EXTENSION:= gpe
-
 LIBS	:=  -L$(PWD)/../libs/GP2XSDL/ -lSDL -lpthread 
-
-
 LIBDIRS	:=	$(DEKVITPRO)/lib
+EXTENSION:= gpe
+
+%.gpe: $(OFILES)
+	$(CXX) -static $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
+	@$(STRIP) $@

projects/Makefile.GP32

@@ -1,3 +1,7 @@
+include $(PWD)/rules_gp32
+
+DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
 
 DEVKITARM=/c/devkitGP32/devkitarm
 
@@ -6,17 +10,13 @@ DEVKITPRO=$(DEVKITARM)/..
 TOOLPATH=$(DEVKITARM)/bin
 PREFIX		:=	arm-linux-
 
-include $(PWD)/rules_gp32
 
 CFLAGS	:=	-Wall -O2 -mtune=arm9tdmi\
  			-fomit-frame-pointer\
 			-ffast-math $(INCLUDE)\
-			-DPLATFORM_$(PLATFORM) -I$(PWD)/../sources
+			$(DEFINES) -I$(PWD)/../sources
 
 CXXFLAGS:=	-fexceptions $(CFLAGS)
-
-EXTENSION:= fxe
-
 LIBS	:=	-lmirkoSDK -laddon -lm
-
 LIBDIRS	:=	$(LIBMIRKO)
+EXTENSION:= fxe

projects/Makefile.MIYOO

@@ -1,33 +1,38 @@
 -include $(PWD)/rules_base
-STRIP = $(CROSS_COMPILE)strip
 
-%.elf: $(OFILES)
-	$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
-	@$(STRIP) $@
+DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
+	-DBUFFERED \
+	-DCPP_MEMORY \
+	-DHAVE_STDINT_H \
+	-D_NDEBUG \
+	-D_NO_JACK_ 
 
 DEVKIT = /opt/miyoomini-toolchain/
 CROSS_COMPILE=$(DEVKIT)bin/arm-linux-gnueabihf-
 
 CC = $(CROSS_COMPILE)gcc
 CXX = $(CROSS_COMPILE)g++
+STRIP = $(CROSS_COMPILE)strip
 SYSROOT     := $(shell $(CROSS_COMPILE)gcc --print-sysroot)
 SDL_CFLAGS  := $(shell $(SYSROOT)/usr/bin/sdl-config --cflags)
 SDL_LIBS    := $(shell $(SYSROOT)/usr/bin/sdl-config --libs)
 
-DEFINES = -DHAVE_STDINT_H -D_NDEBUG -D_NO_JACK_ -I$(PWD)/../sources -DCPP_MEMORY $(SDL_CFLAGS) $(SDL_LIBS) -DBUFFERED
-INCLUDES = -Iinclude $(SDL_CFLAGS)
+INCLUDES = -Iinclude $(SDL_CFLAGS) -I$(PWD)/../sources
 OPT_FLAGS  = -O3 -Ofast -fdata-sections -fdata-sections -fno-common -fno-PIC -flto -marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -march=armv7ve+simd
 
-OUTPUT = ../lgpt-miyoo
 
 TOOLPATH=$(DEVKIT)/usr/bin
 PREFIX		:=	arm-linux-gnueabihf-
 
-CFLAGS	:=	$(DEFINES) $(INCLUDES) $(OPT_FLAGS) -Wall  
+CFLAGS	:=	$(DEFINES) $(INCLUDES) $(SDL_CFLAGS) $(OPT_FLAGS) -Wall  
 CXXFLAGS:=	$(CFLAGS) -std=gnu++03 
-
-EXTENSION:= elf
-
-LIBS	:=  -lSDL -lSDL_mixer -lpthread 
+LIBS	:=  -lSDL -lSDL_mixer -lpthread $(SDL_LIBS)
 LIBDIRS	:=	$(DEKVIT)/usr/lib
 LIBDIRS	+=	$(DEKVIT)/usr/include
+OUTPUT = ../lgpt-miyoo
+EXTENSION:= elf
+
+%.elf: $(OFILES)
+	$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
+	@$(STRIP) $@

projects/Makefile.OSX

@@ -1,14 +1,14 @@
 -include $(PWD)/rules_base
 
-%.app: $(OFILES)
-	$(CXX) $(LDFLAGS) -arch i386 -framework SDL -framework Cocoa -framework Carbon -o $@ $(OFILES) $(LIBS)
-	mv $@ ../lgpt
+DEFINES := \
+	-DPLATFORM_$(PLATFORM)
 
-CFLAGS	:= -O3 -Wall -I$(PWD) -I/Library/Frameworks/SDL.framework/Headers 
 
+CFLAGS	:= -O3 -Wall $(DEFINES) -I$(PWD) -I/Library/Frameworks/SDL.framework/Headers 
 CXXFLAGS:= $(CFLAGS)
-
-EXTENSION:= app
-
 LIBS	:=  
+EXTENSION:= app
 
+%.app: $(OFILES)
+	$(CXX) $(LDFLAGS) -arch i386 -framework SDL -framework Cocoa -framework Carbon -o $@ $(OFILES) $(LIBS)
+	mv $@ ../lgpt

projects/Makefile.PSP

@@ -1,5 +1,10 @@
 -include $(PWD)/rules_base
 
+DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
+	-DCPP_MEMORY \
+	-DNDEBUG
+
 TARGET=lgpt
 
 export OBJS:=$(OFILES)
@@ -14,11 +19,8 @@ PSP_EBOOT_PIC1 = $(PWD)/psp_bg.png
 PSPSDK=$(shell $(PSPDEV)/bin/psp-config --pspsdk-path)
 PSPBIN = $(PSPSDK)/../bin
 
-CFLAGS	:=	-O3 -G0 -Wall -DPLATFORM_$(PLATFORM) -DNDEBUG -DCPP_MEMORY -I$(PWD)/../sources -I$(PSPSDK)/include
-
+CFLAGS	:=	-O3 -G0 -Wall $(DEFINES) -I$(PWD)/../sources -I$(PSPSDK)/include
 CXXFLAGS:=	$(CFLAGS) -fexceptions -fno-rtti
-
-EXTENSION:= elf
-
 LIBS = -L$(PSPDEV)/psp/lib -lSDL_image -lpng -lz -lstdc++ -lSDL -lGL -lGLU -lglut -lm -lc -ljpeg
 LIBS += -lpspvfpu -lpspgu -lpsphprm -lpsprtc -lpspaudio -lpspirkeyb -lpsppower
+EXTENSION:= elf

projects/Makefile.RASPI

@@ -1,15 +1,17 @@
 -include $(PWD)/rules_base
 
-%.rpi-exe: $(OFILES)
-	$(CXX) -o $(LDFLAGS) $@ $(OFILES) $(LIBS)
-
-CFLAGS := -O3 -DCPP_MEMORY -Wall -I/usr/local/include -I$(PWD)/../sources -D__LINUX_ALSA__ -D__LINUX_ALSASEQ__ -D_NO_JACK_ -D_NDEBUG
-#CFLAGS	:= -g -DCPP_MEMORY -Wall -I/usr/local/include -I$(PWD)/../sources -D__LINUX_ALSA__ -D__LINUX_ALSASEQ__ -D_NO_JACK_
-
+DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
+	-DCPP_MEMORY \
+	-D_NDEBUG \
+	-D_NO_JACK_ \
+	-D__LINUX_ALSA__ \
+	-D__LINUX_ALSASEQ__
 
+CFLAGS := -O3  -Wall $(DEFINES) -I/usr/local/include -I$(PWD)/../sources
 CXXFLAGS:= $(CFLAGS)
-
-EXTENSION:= rpi-exe
-
 LIBS	:= -lasound -lSDL -lpthread
+EXTENSION:= rpi-exe
 
+%.rpi-exe: $(OFILES)
+	$(CXX) -o $(LDFLAGS) $@ $(OFILES) $(LIBS)

projects/Makefile.RG35XXPLUS

@@ -2,6 +2,7 @@
 
 # config
 DEFINES := \
+	-DPLATFORM_$(PLATFORM) \
 	-D_64BIT \
 	-DBUFFERED \
 	-DCPP_MEMORY \