duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile cleanup, and improve cross-compilation support

Browse source 
bin2h should run on the host system, not the target
This commit is contained in:
Clownacy 2019-06-08 17:42:12 +00:00
parent 44094b103e
commit 73b99b6d78
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -1,3 +1,6 @@
NATIVECC = cc
NATIVECXX = c++
ifeq ($(RELEASE), 1) ifeq ($(RELEASE), 1)
CXXFLAGS = -O3 -flto CXXFLAGS = -O3 -flto
LDFLAGS = -s LDFLAGS = -s
@ -179,7 +182,7 @@ RESOURCES = \
ORG/White.org \ ORG/White.org \
ORG/XXXX.org \ ORG/XXXX.org \
ORG/Zonbie.org \ ORG/Zonbie.org \
WAVE/Wave.dat \ WAVE/Wave.dat
ifeq ($(JAPANESE), 1) ifeq ($(JAPANESE), 1)
RESOURCES += BITMAP/pixel_jp.bmp RESOURCES += BITMAP/pixel_jp.bmp
@ -204,12 +207,12 @@ ifeq ($(WINDOWS), 1)
endif endif
all: $(BUILD_DIR)/$(FILENAME) all: $(BUILD_DIR)/$(FILENAME)
@echo Finished
$(BUILD_DIR)/$(FILENAME): $(OBJECTS) $(BUILD_DIR)/$(FILENAME): $(OBJECTS)
@mkdir -p $(@D) @mkdir -p $(@D)
@echo Linking @echo Linking $@
@$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) @$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
@echo Finished compiling: $@
obj/$(BUILD_DIR)/$(FILENAME)/%.o: src/%.cpp obj/$(BUILD_DIR)/$(FILENAME)/%.o: src/%.cpp
@mkdir -p $(@D) @mkdir -p $(@D)
@ -229,7 +232,7 @@ src/Resource/%.h: res/% obj/bin2h
obj/bin2h: bin2h/bin2h.c obj/bin2h: bin2h/bin2h.c
@mkdir -p $(@D) @mkdir -p $(@D)
@echo Compiling $^ @echo Compiling $^
@$(CC) -O3 -s -std=c90 -Wall -Wextra -pedantic $^ -o $@ @$(NATIVECC) -O3 -s -std=c90 -Wall -Wextra -pedantic $^ -o $@
include $(wildcard $(DEPENDENCIES)) include $(wildcard $(DEPENDENCIES))