diff --git a/makerom/deps/libblz/makefile b/makerom/deps/libblz/makefile index 7dc6a33d..cfc7841f 100644 --- a/makerom/deps/libblz/makefile +++ b/makerom/deps/libblz/makefile @@ -1,6 +1,6 @@ # C++/C Recursive Project Makefile # (c) Jack -# Version 7 (20220416) +# Version 8 (20220420) # Project Name PROJECT_NAME = libblz @@ -75,6 +75,7 @@ ifeq ($(PROJECT_PLATFORM), WIN32) # Windows Flags/Libs CC = x86_64-w64-mingw32-gcc CXX = x86_64-w64-mingw32-g++ + DEFINEFLAGS = WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable ARCHFLAGS = INC += @@ -84,6 +85,7 @@ else ifeq ($(PROJECT_PLATFORM), GNU) # GNU/Linux Flags/Libs #CC = #CXX = + DEFINEFLAGS = WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable ARCHFLAGS = INC += @@ -93,6 +95,7 @@ else ifeq ($(PROJECT_PLATFORM), MACOS) # MacOS Flags/Libs #CC = #CXX = + DEFINEFLAGS = WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-private-field ARCHFLAGS = -arch $(PROJECT_PLATFORM_ARCH) INC += @@ -101,8 +104,8 @@ else ifeq ($(PROJECT_PLATFORM), MACOS) endif # Compiler Flags -CXXFLAGS = -std=c++11 $(INC) $(WARNFLAGS) $(ARCHFLAGS) -fPIC -CFLAGS = -std=c11 $(INC) $(WARNFLAGS) $(ARCHFLAGS) -fPIC +CXXFLAGS = -std=c++11 $(INC) $(DEFINEFLAGS) $(WARNFLAGS) $(ARCHFLAGS) -fPIC +CFLAGS = -std=c11 $(INC) $(DEFINEFLAGS) $(WARNFLAGS) $(ARCHFLAGS) -fPIC # Object Files SRC_OBJ = $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .cc,.o,$(wildcard $(dir)/*.cc))) $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .c,.o,$(wildcard $(dir)/*.c))) diff --git a/makerom/deps/libyaml/makefile b/makerom/deps/libyaml/makefile index 785e3b8a..f2c87707 100644 --- a/makerom/deps/libyaml/makefile +++ b/makerom/deps/libyaml/makefile @@ -1,6 +1,6 @@ # C++/C Recursive Project Makefile # (c) Jack -# Version 7 (20220416) +# Version 8 (20220420) # Project Name PROJECT_NAME = libyaml @@ -75,6 +75,7 @@ ifeq ($(PROJECT_PLATFORM), WIN32) # Windows Flags/Libs CC = x86_64-w64-mingw32-gcc CXX = x86_64-w64-mingw32-g++ + DEFINEFLAGS = WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable ARCHFLAGS = INC += @@ -84,6 +85,7 @@ else ifeq ($(PROJECT_PLATFORM), GNU) # GNU/Linux Flags/Libs #CC = #CXX = + DEFINEFLAGS = -D_GNU_SOURCE WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable ARCHFLAGS = INC += @@ -93,6 +95,7 @@ else ifeq ($(PROJECT_PLATFORM), MACOS) # MacOS Flags/Libs #CC = #CXX = + DEFINEFLAGS = WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-private-field ARCHFLAGS = -arch $(PROJECT_PLATFORM_ARCH) INC += @@ -101,8 +104,8 @@ else ifeq ($(PROJECT_PLATFORM), MACOS) endif # Compiler Flags -CXXFLAGS = -std=c++11 $(INC) $(WARNFLAGS) $(ARCHFLAGS) -fPIC -CFLAGS = -std=c11 $(INC) $(WARNFLAGS) $(ARCHFLAGS) -fPIC +CXXFLAGS = -std=c++11 $(INC) $(DEFINEFLAGS) $(WARNFLAGS) $(ARCHFLAGS) -fPIC +CFLAGS = -std=c11 $(INC) $(DEFINEFLAGS) $(WARNFLAGS) $(ARCHFLAGS) -fPIC # Object Files SRC_OBJ = $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .cc,.o,$(wildcard $(dir)/*.cc))) $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .c,.o,$(wildcard $(dir)/*.c))) diff --git a/makerom/makefile b/makerom/makefile index de32f586..546ff976 100644 --- a/makerom/makefile +++ b/makerom/makefile @@ -1,6 +1,6 @@ # C++/C Recursive Project Makefile # (c) Jack -# Version 7 (20220416) +# Version 8 (20220420) # Project Name PROJECT_NAME = makerom @@ -75,6 +75,7 @@ ifeq ($(PROJECT_PLATFORM), WIN32) # Windows Flags/Libs CC = x86_64-w64-mingw32-gcc CXX = x86_64-w64-mingw32-g++ + DEFINEFLAGS = WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable ARCHFLAGS = INC += @@ -84,6 +85,7 @@ else ifeq ($(PROJECT_PLATFORM), GNU) # GNU/Linux Flags/Libs #CC = #CXX = + DEFINEFLAGS = -D_GNU_SOURCE WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable ARCHFLAGS = INC += @@ -93,6 +95,7 @@ else ifeq ($(PROJECT_PLATFORM), MACOS) # MacOS Flags/Libs #CC = #CXX = + DEFINEFLAGS = WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-private-field ARCHFLAGS = -arch $(PROJECT_PLATFORM_ARCH) INC += @@ -101,8 +104,8 @@ else ifeq ($(PROJECT_PLATFORM), MACOS) endif # Compiler Flags -CXXFLAGS = -std=c++11 $(INC) $(WARNFLAGS) $(ARCHFLAGS) -fPIC -CFLAGS = -std=c11 $(INC) $(WARNFLAGS) $(ARCHFLAGS) -fPIC +CXXFLAGS = -std=c++11 $(INC) $(DEFINEFLAGS) $(WARNFLAGS) $(ARCHFLAGS) -fPIC +CFLAGS = -std=c11 $(INC) $(DEFINEFLAGS) $(WARNFLAGS) $(ARCHFLAGS) -fPIC # Object Files SRC_OBJ = $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .cc,.o,$(wildcard $(dir)/*.cc))) $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .c,.o,$(wildcard $(dir)/*.c))) diff --git a/makerom/src/user_settings.c b/makerom/src/user_settings.c index c1b45d44..ffc940f2 100644 --- a/makerom/src/user_settings.c +++ b/makerom/src/user_settings.c @@ -910,7 +910,7 @@ void PrintNoNeedParam(char *arg) void DisplayBanner(void) { - printf("CTR MAKEROM v0.18.2 (C) 3DSGuy 2022\n"); + printf("CTR MAKEROM v0.18.3 (C) 3DSGuy 2022\n"); printf("Built: %s %s\n\n", __TIME__, __DATE__); }