Skip to content

Commit 6326106

Browse files
committed
Move flags reliant on GCC version after Rules.make include
1 parent 8f0f51e commit 6326106

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

modules/network/SMSTCPIP/Makefile

+8-7
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ IOP_LIBS =
1515

1616
IOP_INCS += -Iinclude -I../../iopcore/common
1717
IOP_CFLAGS += -DLWIP_NOASSERT
18-
ifneq ($(IOP_CC_VERSION),3.2.2)
19-
ifneq ($(IOP_CC_VERSION),3.2.3)
20-
IOP_CFLAGS += -mno-memcpy
21-
# Ignore warnings due to the old version of lwIP being used.
22-
IOP_CFLAGS += -Wno-attributes -Wno-array-bounds -Wno-unused-but-set-variable
23-
endif
24-
endif
2518

2619
ifeq ($(INGAME_DRIVER),1)
2720
IOP_CFLAGS += -DINGAME_DRIVER
@@ -38,3 +31,11 @@ endif
3831
include $(PS2SDK)/Defs.make
3932
include ../../Rules.bin.make
4033
include ../../Rules.make
34+
35+
ifneq ($(IOP_CC_VERSION),3.2.2)
36+
ifneq ($(IOP_CC_VERSION),3.2.3)
37+
IOP_CFLAGS += -mno-memcpy
38+
# Ignore warnings due to the old version of lwIP being used.
39+
IOP_CFLAGS += -Wno-attributes -Wno-array-bounds -Wno-unused-but-set-variable
40+
endif
41+
endif

modules/network/lwnbdsvr/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ ifeq ($(DEBUG),1)
88
IOP_CFLAGS += -DDEBUG -DNBD_DEBUG
99
endif
1010

11+
include $(PS2SDK)/Defs.make
12+
include ../../Rules.bin.make
13+
include ../../Rules.make
14+
1115
ifneq ($(IOP_CC_VERSION),3.2.2)
1216
ifneq ($(IOP_CC_VERSION),3.2.3)
1317
# Due to usage of 64 bit integers, support code for __ashldi3 and __lshrdi3 is needed
1418
IOP_LIBS += -lgcc
1519
endif
1620
endif
17-
18-
include $(PS2SDK)/Defs.make
19-
include ../../Rules.bin.make
20-
include ../../Rules.make

0 commit comments

Comments
 (0)