diff options
Diffstat (limited to 'project/Makefile')
| -rw-r--r-- | project/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/project/Makefile b/project/Makefile index e76492a..289fd8e 100644 --- a/project/Makefile +++ b/project/Makefile @@ -57,7 +57,7 @@ WPATT_LONG = Wiimms PAT Tool WSTRT_SHORT = wstrt WSTRT_LONG = Wiimms StaticR Tool -VERSION_NUM = 2.33a +VERSION_NUM = 2.34a BETA_VERSION = 0 # 0:off -1:"beta" >0:"beta#" @@ -144,6 +144,7 @@ DEFINES1 += -DDEBUG_ASSERT # enable ASSERTions in release version too DEFINES1 += -DEXTENDED_ERRORS=1 # enable extended error messages (function,line,file) DEFINES1 += -DUIOPT_INDEX_SIZE=320 # define max number of options (default 0x100) +CFLAGS += $(DCLIB_CFLAGS) CFLAGS += -std=gnu99 -fomit-frame-pointer -fno-strict-aliasing -funroll-loops CFLAGS += -Wall -Wno-parentheses -Wno-unused-function CFLAGS += -Wno-deprecated-declarations -Wno-gnu-variable-sized-type-not-at-end @@ -162,7 +163,7 @@ ifeq ($(SYSTEM_LINUX),1) LDFLAGS += -Xlinker --gc-sections #LDFLAGS += -Xlinker --print-gc-sections LIBS += -ltinfo - LDFLAGS += -static-libgcc + LDFLAGS += -static-libgcc -z noexecstack endif ifeq ($(SYSTEM),cygwin) @@ -357,7 +358,7 @@ DIR_LIST += src src/crypto $(UI) #--- external flags & clean -DEFINES = $(strip $(DEFINES1) $(MODE) $(XDEF)) +DEFINES = $(strip $(DCLIB_DEFINES) $(DEFINES1) $(MODE) $(XDEF)) CFLAGS += $(XFLAGS) CFLAGS := $(strip $(CFLAGS)) LDFLAGS := $(strip $(LDFLAGS)) @@ -739,6 +740,10 @@ flags: @echo "SYSTEM: |$(SYSTEM)|$(SYSTEM2)|" @echo "GCC: |$(GCC_VERSION)|" @echo "" + @echo "DCLIB_GCC + DCLIB_GCC_VERSION: $(DCLIB_GCC) $(DCLIB_GCC_VERSION)" + @echo "DCLIB_DEFINES: $(DCLIB_DEFINES)" + @echo "DCLIB_CFLAGS: $(DCLIB_CFLAGS)" + @echo "" @echo "DEFINES: $(DEFINES)" @echo "" @echo "CFLAGS: $(CFLAGS)" |