Skip to content

Commit

Permalink
Makefile: remove unrequired zconh.h target
Browse files Browse the repository at this point in the history
  • Loading branch information
Rosalie241 committed Jan 7, 2024
1 parent 523ae13 commit ab127d2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
8 changes: 0 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ clean:
check:
$(MAKE) -C SporeModManager check BINARY_DIR=$(BINARY_DIR)/SporeModLoader/SporeModManager

# this is needed due to compiling SporeModLoader twice,
# which, when compiling with multiple threads, will cause
# zconf.h to be generated twice, causing a build failure
# due to a race condition (cp will fail due to the file
# already existing, even with -f)
$(THIRDPARTY_DIR)/zlib/zconf.h: $(THIRDPARTY_DIR)/zlib/zconf.h.in
$(MAKE) -C SporeModManager ../$@

SporeModLoader:
$(MAKE) -C $@ BINARY_DIR=$(BINARY_DIR)/SporebinEP1

Expand Down
6 changes: 1 addition & 5 deletions SporeModManager/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ endif

all: $(BINARY_DIR)/$(EXE_FILE)$(EXE_EXT)

$(THIRDPARTY_DIR)/zlib/zconf.h: $(THIRDPARTY_DIR)/zlib/zconf.h.in
@echo "GEN $@"
$(QUIET)cp -f $@.in $@

$(BINARY_DIR)/$(EXE_FILE): $(THIRDPARTY_OBJECT_FILES) $(OBJECT_FILES)
@echo "LD $@"
$(QUIET)mkdir -p $(BINARY_DIR)
Expand All @@ -117,7 +113,7 @@ $(BINARY_DIR)/$(EXE_FILE).exe: $(THIRDPARTY_OBJECT_FILES) $(OBJECT_FILES)
$(QUIET)$(MINGW_CXX) $(OBJECT_FILES) $(THIRDPARTY_OBJECT_FILES) -o $@ $(LDFLAGS)

clean:
rm -f $(BINARY_DIR)/$(EXE_FILE)$(EXE_EXT) $(OBJECT_FILES) $(THIRDPARTY_OBJECT_FILES) $(THIRDPARTY_HEADER_FILES)
rm -f $(BINARY_DIR)/$(EXE_FILE)$(EXE_EXT) $(OBJECT_FILES) $(THIRDPARTY_OBJECT_FILES)

check: $(BINARY_DIR)/$(EXE_FILE)$(EXE_EXT)
python3 $(SOURCE_DIR)/test.py $(BINARY_DIR)/$(EXE_FILE)$(EXE_EXT) $(TEST_ARGS)
Expand Down

0 comments on commit ab127d2

Please sign in to comment.