DarkStore-3DS/Project_CTR
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Project_CTR.git synced 2026-07-03 00:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[makerom] Changed makefile

Browse Source 
Warning-less compiling on OS X
This commit is contained in:
jakcron
2016-01-08 19:58:31 +08:00
parent 9de65b09ef
commit b1725fda79
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makerom/Makefile
+20 -7
View File
@@ -3,14 +3,27 @@ SRC_DIR = . polarssl libyaml
OBJS = $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c))) OBJS = $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
# Compiler Settings # Compiler Settings
LIBS = -static-libgcc CFLAGS = --std=c99 -O2 -flto -Wall -Wno-unused-value -Wno-unused-result -I.
CXXFLAGS = -I.
CFLAGS = --std=c99 -O2 -flto -Wall -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-result -I. $(MAKEROM_BUILD_FLAGS)
CC = gcc CC = gcc
CXX = g++ ifeq ($(OS),Windows_NT)
#Windows Build CFG
CFLAGS += -Wno-unused-but-set-variable
LIBS += -static-libgcc
else
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
# OS X
CFLAGS +=
LIBS += -liconv
else
# Linux
CFLAGS += -Wno-unused-but-set-variable
LIBS +=
endif
endif
# MAKEROM Build Settings # MAKEROM Build Settings
MAKEROM_BUILD_FLAGS = #-DDEBUG
OUTPUT = makerom OUTPUT = makerom
main: build main: build
@@ -18,7 +31,7 @@ main: build
rebuild: clean build rebuild: clean build
build: $(OBJS) build: $(OBJS)
$(CXX) -o $(OUTPUT) $(LIBS) $(OBJS) $(CC) -o $(OUTPUT) $(LIBS) $(OBJS)
clean: clean:
rm -rf $(OUTPUT) $(OBJS) *.cci *.cia *.cxi *.cfa rm -rf $(OUTPUT) $(OBJS)
makerom/utils.h
+2 -4
View File
@@ -18,7 +18,7 @@ u64 min64(u64 a, u64 b);
u64 max64(u64 a, u64 b); u64 max64(u64 a, u64 b);
// Strings // Strings
void memdump(FILE* fout, const char* prefix, const const u8* data, u32 size); void memdump(FILE* fout, const char* prefix, const u8* data, u32 size);
char* replace_filextention(const char *input, const char *extention); char* replace_filextention(const char *input, const char *extention);
// Base64 // Base64
@@ -52,6 +52,4 @@ u32 u8_to_u32(const u8 *value, u8 endianness);
u64 u8_to_u64(const u8 *value, u8 endianness); u64 u8_to_u64(const u8 *value, u8 endianness);
int u16_to_u8(u8 *out_value, u16 in_value, u8 endianness); int u16_to_u8(u8 *out_value, u16 in_value, u8 endianness);
int u32_to_u8(u8 *out_value, u32 in_value, u8 endianness); int u32_to_u8(u8 *out_value, u32 in_value, u8 endianness);
int u64_to_u8(u8 *out_value, u64 in_value, u8 endianness); int u64_to_u8(u8 *out_value, u64 in_value, u8 endianness);