summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMax <mparisi@stevens.edu>2020-12-19 12:39:50 -0500
committerMax <mparisi@stevens.edu>2020-12-19 12:39:50 -0500
commit4f3e87d037cfc6efcafc605e309edc71179cbb7a (patch)
tree5036da5a71c08c37e2c9d674a06f6699e69d8e2f /Makefile
parent128935015a3fd7f53404315c268c3d2424af4dc7 (diff)
argument parsing issue in pragma.py when compiler is invoked through wine
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index a3ab689..6141243 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ EXE := .exe
WINE :=
else
EXE :=
-WINE := wine
+WINE := wine
endif
ifeq ($(NOWINE),1)
@@ -77,8 +77,8 @@ MWCC_VERSION := 3.0
AS := $(DEVKITPPC)/bin/powerpc-eabi-as
OBJCOPY := $(DEVKITPPC)/bin/powerpc-eabi-objcopy
CPP := cpp -P
-CC := $(WINE) tools/mwcc_compiler/GC/$(MWCC_VERSION)/mwcceppc.exe
-LD := $(WINE) tools/mwcc_compiler/GC/$(MWCC_VERSION)/mwldeppc.exe
+CC := $(WINE)tools/mwcc_compiler/GC/$(MWCC_VERSION)/mwcceppc.exe
+LD := $(WINE)tools/mwcc_compiler/GC/$(MWCC_VERSION)/mwldeppc.exe
ELF2DOL := tools/elf2dol/elf2dol$(EXE)
SHA1SUM := sha1sum
PYTHON := python3
@@ -155,7 +155,7 @@ $(BUILD_DIR)/%.o: %.s
$(PYTHON) $(POSTPROC) $(PROCFLAGS) $@
$(BUILD_DIR)/%.o: %.cpp
- $(PYTHON) $(PRAGMAPROC) $(CC) "$(CFLAGS) -lang c++ -c" $@ $< -fix-regswaps
+ $(PYTHON) $(PRAGMAPROC) "$(CC)" "$(CFLAGS) -lang c++ -c" $@ $< -fix-regswaps
$(BUILD_DIR)/%.o: %.c
- $(PYTHON) $(PRAGMAPROC) $(CC) "$(CFLAGS) -lang c99 -c" $@ $< -fix-regswaps
+ $(PYTHON) $(PRAGMAPROC) "$(CC)" "$(CFLAGS) -lang c99 -c" $@ $< -fix-regswaps