bilbo/breakout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove extraneous libstdc++ dependency, add support for 32-bit builds

Browse Source
This commit is contained in:
Zack Buhman 2025-12-06 15:34:20 -06:00
parent dfc2358117
commit 4c6f6802aa
3 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Makefile
View File

@ -16,9 +16,10 @@ CFLAGS += -Wno-error=unused-const-variable
CFLAGS += -Wno-error=unused-but-set-variable CFLAGS += -Wno-error=unused-but-set-variable
CFLAGS += -Wno-error=unused-variable CFLAGS += -Wno-error=unused-variable
CFLAGS += -I$(MAKEFILE_PATH)/include CFLAGS += -I$(MAKEFILE_PATH)/include
CXXFLAGS += -fno-exceptions
#CFLAGS += -DDEBUG_BUTTONS #CFLAGS += -DDEBUG_BUTTONS
#CFLAGS += -DDEBUG_AXES #CFLAGS += -DDEBUG_AXES
LDFLAGS += -lm LDFLAGS += -nostdlib++ -lm -static-libgcc
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
LDFLAGS += -Wl,--subsystem,windows -mwindows LDFLAGS += -Wl,--subsystem,windows -mwindows
endif endif
@ -27,13 +28,29 @@ ifndef GLFW
$(error GLFW undefined) $(error GLFW undefined)
endif endif
ifeq ($(shell uname),Linux) ifdef I386
OBJARCH = -O elf64-x86-64 ARCH='-m32'
LDFLAGS += -z noexecstack
else
OBJARCH = -O pe-x86-64 -B i386:x86-64
endif endif
ifeq ($(shell uname),Linux)
LDFLAGS += -z noexecstack
ifdef I386
OBJARCH = -O elf32-i386 -B i386
else
OBJARCH = -O elf64-x86-64 -B i386:x86-64
endif
else
ifdef I386
OBJARCH += -O pe-i386 -B i386
else
OBJARCH += -O pe-x86-64 -B i386:x86-64
endif
endif # ifeq ($(shell uname),Linux)
DEPFLAGS = -MMD -MP DEPFLAGS = -MMD -MP
OPT = -Og OPT = -Og
@ -98,10 +115,10 @@ clean:
rm -f main rm -f main
%.o: %.cpp %.o: %.cpp
$(CXX) $(CXXSTD) $(CFLAGS) $(OPT) $(DEBUG) $(DEPFLAGS) -MF ${<}.d -c $< -o $@ $(CXX) $(CXXSTD) $(ARCH) $(CFLAGS) $(OPT) $(DEBUG) $(DEPFLAGS) -MF ${<}.d -c $< -o $@
%.o: %.c %.o: %.c
$(CC) $(CSTD) $(CFLAGS) $(OPT) $(DEBUG) $(DEPFLAGS) -MF ${<}.d -c $< -o $@ $(CC) $(CSTD) $(ARCH) $(CFLAGS) $(CXXFLAGS) $(OPT) $(DEBUG) $(DEPFLAGS) -MF ${<}.d -c $< -o $@
MAIN_OBJS = \ MAIN_OBJS = \
src/main.o \ src/main.o \
@ -119,7 +136,7 @@ MAIN_OBJS = \
$(GLFW) $(GLFW)
main: $(MAIN_OBJS) main: $(MAIN_OBJS)
$(CXX) $^ -o $@ $(LDFLAGS) $(CXX) $^ $(CXXFLAGS) $(ARCH) -o $@ $(LDFLAGS)
#-include $(shell find -type f -name 'src/*.d') #-include $(shell find -type f -name 'src/*.d')

12
build.sh Normal file
View File

@ -0,0 +1,12 @@
set -eux
make \
GLFW=$HOME/glfw-3.4/src/libglfw3.a \
-B -j$(nproc)
mv main engineless-any-percent-speedrun.x86_64.elf
make \
GLFW=$HOME/glfw-3.4-i386/src/libglfw3.a \
I386=1 \
-B -j$(nproc)
mv main engineless-any-percent-speedrun.x86_32.elf

3
windows_build.sh
View File

@ -1,3 +0,0 @@
set -eux
GLFW=$HOME/glfw-3.4/src/libglfw3.a make -j$(nproc)