Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use 'rsync' instead of 'find' + 'cp -r --parents' 

mostly because cp is fucking weird on OSX, thank you Apple very cool
This commit is contained in:
fgsfds 2020-06-02 17:57:23 +03:00
parent ddb4977e68
commit 88bad645ed
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -451,7 +451,7 @@ ENDIAN_BITWIDTH := $(BUILD_DIR)/endian-and-bitwidth
AS := $(CROSS)as AS := $(CROSS)as
ifeq ($(OSX_BUILD),1) ifeq ($(OSX_BUILD),1)
AS := i686-w64-mingw32-as AS := i686-w64-mingw32-as
endif endif
ifneq ($(TARGET_WEB),1) # As in, not-web PC port ifneq ($(TARGET_WEB),1) # As in, not-web PC port
@ -618,21 +618,22 @@ ZEROTERM = $(PYTHON) $(TOOLS_DIR)/zeroterm.py
all: $(EXE) all: $(EXE)
ifeq ($(EXTERNAL_DATA),1) ifeq ($(EXTERNAL_DATA),1)
# depend on resources as well # depend on resources as well
all: res all: res
# prepares the resource folder for external data # prepares the resource folder for external data
res: $(EXE) res: $(EXE)
@mkdir -p $(BUILD_DIR)/res
@mkdir -p $(BUILD_DIR)/res/sound @mkdir -p $(BUILD_DIR)/res/sound
@cp -r -f textures/ $(BUILD_DIR)/res/ @rsync -zar --prune-empty-dirs textures $(BUILD_DIR)/res/
@cp -r -f $(BUILD_DIR)/textures/skybox_tiles/ $(BUILD_DIR)/res/textures/ @rsync -zar --prune-empty-dirs --include="*/" --include="*.png" --exclude="*" actors $(BUILD_DIR)/res/
@rsync -zar --prune-empty-dirs --include="*/" --include="*.png" --exclude="*" levels $(BUILD_DIR)/res/
@rsync -zar --prune-empty-dirs $(BUILD_DIR)/textures/skybox_tiles $(BUILD_DIR)/res/textures/
@cp -f $(SOUND_BIN_DIR)/sound_data.ctl $(BUILD_DIR)/res/sound/ @cp -f $(SOUND_BIN_DIR)/sound_data.ctl $(BUILD_DIR)/res/sound/
@cp -f $(SOUND_BIN_DIR)/sound_data.tbl $(BUILD_DIR)/res/sound/ @cp -f $(SOUND_BIN_DIR)/sound_data.tbl $(BUILD_DIR)/res/sound/
@cp -f $(SOUND_BIN_DIR)/sequences.bin $(BUILD_DIR)/res/sound/ @cp -f $(SOUND_BIN_DIR)/sequences.bin $(BUILD_DIR)/res/sound/
@cp -f $(SOUND_BIN_DIR)/bank_sets $(BUILD_DIR)/res/sound/ @cp -f $(SOUND_BIN_DIR)/bank_sets $(BUILD_DIR)/res/sound/
@find actors -name \*.png -exec cp --parents {} $(BUILD_DIR)/res/ \;
@find levels -name \*.png -exec cp --parents {} $(BUILD_DIR)/res/ \;
endif endif
clean: clean: