Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix multiprocessing in Makefiles #166

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix multiprocessing in Makefiles #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ env.sh: Makefile
# automate compilation and installation of LibGme_m dependency
$(LIBGME_M_RELPATH):
prefix=$(CURDIR)/pc/bin CROSS_COMPILE=$(CROSS_COMPILE) \
make -C submodules/libgme_m install-lib-direct
$(MAKE) -C submodules/libgme_m install-lib-direct
clean-gme_m:
rm -f $(LIBGME_M_RELPATH)*

Expand All @@ -62,7 +62,7 @@ $(SPCDRIVER_RELPATH): snes_driver/spc.sym snes_driver/gen_spc.sh Makefile snes_d
cd snes_driver && wlaprefix=$(WLAPREFIX) ./gen_spc.sh ../$(SPCDRIVER_RELPATH)

snes_driver/spc.sym: FORCE Makefile snes_driver/Makefile
make -C snes_driver
$(MAKE) -C snes_driver

snes_driver/Makefile: snes_driver/genmake Makefile
cd snes_driver ; wlaprefix=$(WLAPREFIX) pcx2snes_prefix=$(PCX2SNES_PREFIX) ./genmake > Makefile
Expand All @@ -86,15 +86,15 @@ $(APURAM_HEADER): snes_driver/spc.sym Makefile \
# but I guess I'll keep it non-global..?

$(EXE_TRACKER_RELPATH): FORCE pc/tracker/apuram.h $(LIBGME_M_RELPATH)
make -C pc
$(MAKE) -C pc

FORCE: ;

clean: clean-gme_m
# remove generated files
rm -f $(APURAM_HEADER)
rm -f $(SPCDRIVER_RELPATH)
make -C pc clean
make -C snes_driver clean
make -C submodules/libgme_m clean
$(MAKE) -C pc clean
$(MAKE) -C snes_driver clean
$(MAKE) -C submodules/libgme_m clean
rm -f pc/bin/*.dll
8 changes: 4 additions & 4 deletions pc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,15 +321,15 @@ $(BIN)/$(DEC7Z): $(PROJ_DIR)/lzma1505/C/Util/7z/$(DEC7Z) $(PROJ_DIR)/lzma1505/C/
cp $(PROJ_DIR)/lzma1505/C/Util/7z/$(DEC7Z) $(BIN)

$(PROJ_DIR)/lzma1505/C/Util/7z/$(DEC7Z):
uname_S=$(uname_S) make -C $(PROJ_DIR)/lzma1505/C/Util/7z -f makefile.gcc
uname_S=$(uname_S) $(MAKE) -C $(PROJ_DIR)/lzma1505/C/Util/7z -f makefile.gcc

$(BIN)/$(UNRAR): $(PROJ_DIR)/unrar/$(UNRAR)
cp $(PROJ_DIR)/unrar/$(UNRAR) $(BIN)
$(PROJ_DIR)/unrar/$(UNRAR):
uname_S=$(uname_S) make -C $(PROJ_DIR)/unrar
uname_S=$(uname_S) $(MAKE) -C $(PROJ_DIR)/unrar

$(LIBJDKMIDI_LIB): $(LIBJDKMIDI_OSDIR)/Makefile
cd $(LIBJDKMIDI_OSDIR) && make
cd $(LIBJDKMIDI_OSDIR) && $(MAKE)

$(LIBJDKMIDI_OSDIR)/Makefile:
cd $(LIBJDKMIDI_OSDIR) && osxflags="$(OSX_BACKSUPPORT)" ./configure
Expand Down Expand Up @@ -362,7 +362,7 @@ clean:
find . -name "*.o" -o -name "*.d" | xargs rm -rf
rm -f {$(PROJ_DIR)/lzma1505/C/Util/7z/,}{7zDec,7zDec.exe}
rm -f {$(PROJ_DIR)/unrar/,}{unrar,unrar.exe}
cd $(LIBJDKMIDI_OSDIR) && make clean
cd $(LIBJDKMIDI_OSDIR) && $(MAKE) clean

# DO NOT DELETE THIS LINE -- make depend depends on it.
-include $(DEP_DEBUGGER) $(DEP_TRACKER)