From 46451affed22745ae29e4dede5341d61586d81a6 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Mon, 9 Sep 2024 17:03:53 +0930 Subject: [PATCH 1/2] Platform Makefile Cleanup * All Platforms now have a defines section at the top to make it easier to see what is enabled in each * All Platforms now define there platform for consistency * All Makefiles are in aprox the same order --- projects/Makefile.BEAGLEBOARD | 18 +++++++++++------- projects/Makefile.BITTBOY | 34 ++++++++++++++++++---------------- projects/Makefile.CAANOO | 23 ++++++++++++----------- projects/Makefile.DEB | 1 + projects/Makefile.DINGOO | 21 ++++++++++++--------- projects/Makefile.GARLIC | 3 ++- projects/Makefile.GARLICPLUS | 1 + projects/Makefile.GP2X | 25 ++++++++++++------------- projects/Makefile.GP32 | 12 ++++++------ projects/Makefile.MIYOO | 29 +++++++++++++++++------------ projects/Makefile.OSX | 14 +++++++------- projects/Makefile.PSP | 12 +++++++----- projects/Makefile.RASPI | 20 +++++++++++--------- projects/Makefile.RG35XXPLUS | 1 + projects/Makefile.RS97 | 28 ++++++++++++++++------------ projects/Makefile.STEAM | 16 ++++++++++------ projects/Makefile.W32 | 13 +++++++------ projects/Makefile.X64 | 1 + projects/Makefile.X86 | 1 + 19 files changed, 153 insertions(+), 120 deletions(-) diff --git a/projects/Makefile.BEAGLEBOARD b/projects/Makefile.BEAGLEBOARD index 990643cc..a9c3c3d0 100644 --- a/projects/Makefile.BEAGLEBOARD +++ b/projects/Makefile.BEAGLEBOARD @@ -1,7 +1,11 @@ -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 @@ -9,11 +13,11 @@ 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) diff --git a/projects/Makefile.BITTBOY b/projects/Makefile.BITTBOY index 4a80ff5b..2b505bcf 100644 --- a/projects/Makefile.BITTBOY +++ b/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) $@ diff --git a/projects/Makefile.CAANOO b/projects/Makefile.CAANOO index 9acfc535..ac38d50a 100644 --- a/projects/Makefile.CAANOO +++ b/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 diff --git a/projects/Makefile.DEB b/projects/Makefile.DEB index 66cda35c..9c79d941 100644 --- a/projects/Makefile.DEB +++ b/projects/Makefile.DEB @@ -2,6 +2,7 @@ # config DEFINES := \ + -DPLATFORM_$(PLATFORM) \ -DCPP_MEMORY \ -D_DEBUG \ -D__LINUX_ALSA__ \ diff --git a/projects/Makefile.DINGOO b/projects/Makefile.DINGOO index 41e778ed..0a95fa36 100644 --- a/projects/Makefile.DINGOO +++ b/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) $@ diff --git a/projects/Makefile.GARLIC b/projects/Makefile.GARLIC index cc658479..657f6abe 100644 --- a/projects/Makefile.GARLIC +++ b/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 diff --git a/projects/Makefile.GARLICPLUS b/projects/Makefile.GARLICPLUS index f6f68156..72ce69c4 100644 --- a/projects/Makefile.GARLICPLUS +++ b/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 \ diff --git a/projects/Makefile.GP2X b/projects/Makefile.GP2X index 52d393e0..7fe044be 100644 --- a/projects/Makefile.GP2X +++ b/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) $@ diff --git a/projects/Makefile.GP32 b/projects/Makefile.GP32 index eebe04a5..472ee87a 100644 --- a/projects/Makefile.GP32 +++ b/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 diff --git a/projects/Makefile.MIYOO b/projects/Makefile.MIYOO index d889260f..e38c4117 100644 --- a/projects/Makefile.MIYOO +++ b/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) $@ diff --git a/projects/Makefile.OSX b/projects/Makefile.OSX index 86e9cd17..0701c388 100644 --- a/projects/Makefile.OSX +++ b/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 diff --git a/projects/Makefile.PSP b/projects/Makefile.PSP index 0d8efc45..a4ab16d9 100644 --- a/projects/Makefile.PSP +++ b/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 diff --git a/projects/Makefile.RASPI b/projects/Makefile.RASPI index e3471173..2f429d5d 100644 --- a/projects/Makefile.RASPI +++ b/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) diff --git a/projects/Makefile.RG35XXPLUS b/projects/Makefile.RG35XXPLUS index 97d10508..08c797a0 100644 --- a/projects/Makefile.RG35XXPLUS +++ b/projects/Makefile.RG35XXPLUS @@ -2,6 +2,7 @@ # config DEFINES := \ + -DPLATFORM_$(PLATFORM) \ -D_64BIT \ -DBUFFERED \ -DCPP_MEMORY \ diff --git a/projects/Makefile.RS97 b/projects/Makefile.RS97 index 425f8002..5695fa7c 100644 --- a/projects/Makefile.RS97 +++ b/projects/Makefile.RS97 @@ -1,24 +1,28 @@ -include $(PWD)/rules_base -STRIP = ls - -%.dge: $(OFILES) - $(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) - @$(STRIP) $@ +DEFINES := \ + -DPLATFORM_DINGOO \ + -DCPP_MEMORY \ + -D_NDEBUG \ + -D_NO_JACK_ \ + -D__LINUX_OSS__ \ + -DRS97 \ + -DUSB_TTY DEVKIT=/opt/mipsel-rg350-linux-uclibc_sdk-buildroot -TARGET = lgpt.dge - +STRIP = ls TOOLPATH=$(DEVKIT)/usr/bin PREFIX := mipsel-linux- SDL_BASE = /opt/mipsel-rg350-linux-uclibc_sdk-buildroot/usr/mipsel-rg350-linux-uclibc/sysroot/usr/bin/ -CFLAGS := `$(SDL_BASE)sdl-config --cflags` -O3 -D_NDEBUG -D_NO_JACK_ -Wall -DPLATFORM_DINGOO -I$(PWD)/../sources -D__LINUX_OSS__ -DCPP_MEMORY -DRS97 -DUSB_TTY - +CFLAGS := `$(SDL_BASE)sdl-config --cflags` -O3 $(DEFINES) -Wall -I$(PWD)/../sources CXXFLAGS:= $(CFLAGS) -std=gnu++03 - -EXTENSION:= dge - LIBS := -lSDL -lpthread LIBDIRS := $(DEKVIT)/usr/lib +TARGET = lgpt.dge +EXTENSION:= dge + +%.dge: $(OFILES) + $(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) + @$(STRIP) $@ diff --git a/projects/Makefile.STEAM b/projects/Makefile.STEAM index 37f5a131..e76d3fb4 100644 --- a/projects/Makefile.STEAM +++ b/projects/Makefile.STEAM @@ -1,16 +1,20 @@ -include $(PWD)/rules_base -%.steam-exe: $(OFILES) - $(CXX) -o $(LDFLAGS) $@ $(OFILES) $(LIBS) +DEFINES := \ + -DPLATFORM_$(PLATFORM) \ + -DCPP_MEMORY \ + -D_NO_JACK_ \ + -D__LINUX_ALSA__ \ + -D__LINUX_ALSASEQ__ SYSROOT := $(shell gcc --print-sysroot) SDL_CFLAGS := $(shell $(SYSROOT)/usr/bin/sdl-config --cflags) SDL_LIBS := $(shell $(SYSROOT)/usr/bin/sdl-config --libs) -CFLAGS := -O3 -D_NO_JACK_ -DCPP_MEMORY -Wall -I/usr/local/include -I$(PWD)/../sources -D__LINUX_ALSA__ -D__LINUX_ALSASEQ__ $(SDL_CFLAGS) $(SDL_LIBS) - +CFLAGS := -O3 $(DEFINES) -Wall -I/usr/local/include -I$(PWD)/../sources $(SDL_CFLAGS) CXXFLAGS:= $(CFLAGS) - +LIBS := -O3 -L/local/lib -Wl,-rpath,/usr/local/lib $(SDL_LIBS) -lasound -lSDL -lSDL_mixer -lpthread EXTENSION:= steam-exe -LIBS := -O3 -L/local/lib -Wl,-rpath,/usr/local/lib -lasound -lSDL -lSDL_mixer -lpthread +%.steam-exe: $(OFILES) + $(CXX) -o $(LDFLAGS) $@ $(OFILES) $(LIBS) diff --git a/projects/Makefile.W32 b/projects/Makefile.W32 index ac96e536..b756dffd 100644 --- a/projects/Makefile.W32 +++ b/projects/Makefile.W32 @@ -1,14 +1,15 @@ +include $(PWD)/rules_base -WTOOLPATH=C:\MinGW\bin +DEFINES := \ + -DPLATFORM_$(PLATFORM) \ + -D_DEBUG \ + -DDEBUG +WTOOLPATH=C:\MinGW\bin PREFIX := -include $(PWD)/rules_base - -CFLAGS := -mthreads -g -Wall $(INCLUDES) -D_DEBUG -DDEBUG -DPLATFORM_$(PLATFORM) -I$(PWD)/../sources - +CFLAGS := -mthreads -g -Wall $(INCLUDES) $(DEFINES) -I$(PWD)/../sources CXXFLAGS:= $(CFLAGS) LDFLAGS := -L../libs/Wsdl-mingw LIBS := -lmingw32 -lSDL -lSDLmain -mwindows -luser32 -lgdi32 -lwinmm -ldxguid - EXTENSION:= exe diff --git a/projects/Makefile.X64 b/projects/Makefile.X64 index 7fadf8c5..f7891dff 100644 --- a/projects/Makefile.X64 +++ b/projects/Makefile.X64 @@ -2,6 +2,7 @@ # config DEFINES := \ + -DPLATFORM_$(PLATFORM) \ -D_64BIT \ -DCPP_MEMORY \ -D__LINUX_ALSA__ \ diff --git a/projects/Makefile.X86 b/projects/Makefile.X86 index 669d616b..73aaedd3 100644 --- a/projects/Makefile.X86 +++ b/projects/Makefile.X86 @@ -2,6 +2,7 @@ # config DEFINES := \ + -DPLATFORM_$(PLATFORM) \ -DCPP_MEMORY \ -D__LINUX_ALSA__ \ -D__LINUX_ALSASEQ__ \ From a665d88adb5fc3dd27f0dd1baad95ae91281e20f Mon Sep 17 00:00:00 2001 From: djdiskmachine <110535302+djdiskmachine@users.noreply.github.com> Date: Tue, 10 Sep 2024 19:33:05 +0200 Subject: [PATCH 2/2] Update Makefile.RASPI --- projects/Makefile.RASPI | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/Makefile.RASPI b/projects/Makefile.RASPI index 2f429d5d..efead045 100644 --- a/projects/Makefile.RASPI +++ b/projects/Makefile.RASPI @@ -4,9 +4,9 @@ DEFINES := \ -DPLATFORM_$(PLATFORM) \ -DCPP_MEMORY \ -D_NDEBUG \ - -D_NO_JACK_ \ + -D_NO_JACK_ \ -D__LINUX_ALSA__ \ - -D__LINUX_ALSASEQ__ + -D__LINUX_ALSASEQ__ CFLAGS := -O3 -Wall $(DEFINES) -I/usr/local/include -I$(PWD)/../sources CXXFLAGS:= $(CFLAGS)