Move flags reliant on GCC version after Rules.make include

ps2homebrew · Jun 11, 2021 · 6326106 · 6326106
1 parent 8f0f51e
commit 6326106
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/modules/network/SMSTCPIP/Makefile b/modules/network/SMSTCPIP/Makefile
@@ -15,13 +15,6 @@ IOP_LIBS =
 
 IOP_INCS += -Iinclude -I../../iopcore/common
 IOP_CFLAGS += -DLWIP_NOASSERT
-ifneq ($(IOP_CC_VERSION),3.2.2)
-ifneq ($(IOP_CC_VERSION),3.2.3)
-IOP_CFLAGS += -mno-memcpy
-# Ignore warnings due to the old version of lwIP being used.
-IOP_CFLAGS += -Wno-attributes -Wno-array-bounds -Wno-unused-but-set-variable
-endif
-endif
 
 ifeq ($(INGAME_DRIVER),1)
 IOP_CFLAGS += -DINGAME_DRIVER
@@ -38,3 +31,11 @@ endif
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
 include ../../Rules.make
+
+ifneq ($(IOP_CC_VERSION),3.2.2)
+ifneq ($(IOP_CC_VERSION),3.2.3)
+IOP_CFLAGS += -mno-memcpy
+# Ignore warnings due to the old version of lwIP being used.
+IOP_CFLAGS += -Wno-attributes -Wno-array-bounds -Wno-unused-but-set-variable
+endif
+endif
diff --git a/modules/network/lwnbdsvr/Makefile b/modules/network/lwnbdsvr/Makefile
@@ -8,13 +8,13 @@ ifeq ($(DEBUG),1)
 IOP_CFLAGS += -DDEBUG -DNBD_DEBUG
 endif
 
+include $(PS2SDK)/Defs.make
+include ../../Rules.bin.make
+include ../../Rules.make
+
 ifneq ($(IOP_CC_VERSION),3.2.2)
 ifneq ($(IOP_CC_VERSION),3.2.3)
 # Due to usage of 64 bit integers, support code for __ashldi3 and __lshrdi3 is needed
 IOP_LIBS += -lgcc
 endif
 endif
-
-include $(PS2SDK)/Defs.make
-include ../../Rules.bin.make
-include ../../Rules.make