Skip to content

Commit dec9cd9

Browse files
authored
Merge pull request #1926 from johnbaumann/makefile_flag_fixes
Quotes for flags, add flag propogation to lua and paths
2 parents 7e0a17f + 118d4e6 commit dec9cd9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/mips/psyqo-lua/psyqo-lua.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LDFLAGS += \
1414
include $(PSYQOLUADIR)../psyqo/psyqo.mk
1515

1616
$(PSYQOLUADIR)libpsyqo-lua.a:
17-
$(MAKE) -C $(PSYQOLUADIR) BUILD=$(BUILD)
17+
$(MAKE) -C $(PSYQOLUADIR) BUILD=$(BUILD) CPPFLAGS_$(BUILD)="$(CPPFLAGS_$(BUILD))" LDFLAGS_$(BUILD)="$(LDFLAGS_$(BUILD))"
1818

1919
$(PSYQOLUADIR)../../../third_party/psxlua/src/liblua.a:
2020
$(MAKE) -C $(PSYQOLUADIR)../../../third_party/psxlua/ psx

src/mips/psyqo-paths/psyqo-paths.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LIBRARIES += $(PSYQOPATHSDIR)libpsyqo-paths.a
66
include $(PSYQOPATHSDIR)../psyqo/psyqo.mk
77

88
$(PSYQOPATHSDIR)libpsyqo-paths.a:
9-
$(MAKE) -C $(PSYQOPATHSDIR) BUILD=$(BUILD)
9+
$(MAKE) -C $(PSYQOPATHSDIR) BUILD=$(BUILD) CPPFLAGS_$(BUILD)="$(CPPFLAGS_$(BUILD))" LDFLAGS_$(BUILD)="$(LDFLAGS_$(BUILD))"
1010

1111
clean::
1212
$(MAKE) -C $(PSYQOPATHSDIR) clean

src/mips/psyqo/psyqo.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CXXFLAGS += -std=c++20
88
include $(PSYQODIR)../common.mk
99

1010
$(PSYQODIR)libpsyqo.a:
11-
$(MAKE) -C $(PSYQODIR) BUILD=$(BUILD) CPPFLAGS_$(BUILD)=$(CPPFLAGS_$(BUILD)) LDFLAGS_$(BUILD)=$(LDFLAGS_$(BUILD))
11+
$(MAKE) -C $(PSYQODIR) BUILD=$(BUILD) CPPFLAGS_$(BUILD)="$(CPPFLAGS_$(BUILD))" LDFLAGS_$(BUILD)="$(LDFLAGS_$(BUILD))"
1212

1313
clean::
1414
$(MAKE) -C $(PSYQODIR) clean

0 commit comments

Comments
 (0)