use $(LIBOGC_INC) and $(LIBOGC_LIB)
This commit is contained in:
parent
55c6b5968b
commit
ff80b8d007
|
@ -15,8 +15,8 @@ LIB_DIR := lib
|
||||||
BIN_DIR := bin/wii
|
BIN_DIR := bin/wii
|
||||||
SDL_OBJ_DIR := $(OBJ_DIR)/sdl
|
SDL_OBJ_DIR := $(OBJ_DIR)/sdl
|
||||||
SDL_SRC_DIR := src
|
SDL_SRC_DIR := src
|
||||||
INSTALL_HEADER_DIR ?= $(DEVKITPRO)/libogc/include
|
INSTALL_HEADER_DIR ?= $(LIBOGC_INC)
|
||||||
INSTALL_LIB_DIR ?= $(DEVKITPRO)/libogc/lib/wii
|
INSTALL_LIB_DIR ?= $(LIBOGC_LIB)
|
||||||
|
|
||||||
# Tools.
|
# Tools.
|
||||||
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
||||||
|
@ -89,12 +89,12 @@ $(BIN_DIR)/%.dol: $(TEST_OBJ_DIR)/%.elf
|
||||||
|
|
||||||
# Compilation flags.
|
# Compilation flags.
|
||||||
COMMON_FLAGS := -g -O3 -Wall $(MACHDEP)
|
COMMON_FLAGS := -g -O3 -Wall $(MACHDEP)
|
||||||
INCLUDES := -Iinclude -I$(DEVKITPRO)/libogc/include
|
INCLUDES := -Iinclude -I$(LIBOGC_INC)
|
||||||
DEFINES := -DGEKKO
|
DEFINES := -DGEKKO
|
||||||
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
||||||
|
|
||||||
# Test link flags.
|
# Test link flags.
|
||||||
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(DEVKITPRO)/libogc/lib/wii -lSDL -lwiikeyboard -lfat -lwiiuse -lbte -logc -lm
|
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(LIBOGC_LIB) -lSDL -lwiikeyboard -lfat -lwiiuse -lbte -logc -lm
|
||||||
|
|
||||||
# How to compile C file (SDL library).
|
# How to compile C file (SDL library).
|
||||||
$(SDL_OBJ_DIR)/%.o: $(SDL_SRC_DIR)/%.c
|
$(SDL_OBJ_DIR)/%.o: $(SDL_SRC_DIR)/%.c
|
||||||
|
|
|
@ -17,8 +17,8 @@ SRC_DIR := src
|
||||||
INCLUDE_DIR := include
|
INCLUDE_DIR := include
|
||||||
TEST_OBJ_DIR := $(OBJ_DIR)/test
|
TEST_OBJ_DIR := $(OBJ_DIR)/test
|
||||||
TEST_SRC_DIR := src
|
TEST_SRC_DIR := src
|
||||||
INSTALL_HEADER_DIR ?= $(DEVKITPRO)/libogc/include
|
INSTALL_HEADER_DIR ?= $(LIBOGC_INC)
|
||||||
INSTALL_LIB_DIR ?= $(DEVKITPRO)/libogc/lib/wii
|
INSTALL_LIB_DIR ?= $(LIBOGC_LIB)
|
||||||
|
|
||||||
# Tools.
|
# Tools.
|
||||||
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
||||||
|
@ -58,7 +58,7 @@ headers:
|
||||||
|
|
||||||
# Compilation flags.
|
# Compilation flags.
|
||||||
COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP)
|
COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP)
|
||||||
INCLUDES := -Iinclude -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL
|
INCLUDES := -Iinclude -I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL
|
||||||
DEFINES := -DGEKKO -DDEBUG_ERROR -DDEBUG_TIMERS -DDEBUG_THREADS -DDEBUG_BUILD -DDEBUG_CONVERT
|
DEFINES := -DGEKKO -DDEBUG_ERROR -DDEBUG_TIMERS -DDEBUG_THREADS -DDEBUG_BUILD -DDEBUG_CONVERT
|
||||||
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@ SRC_DIR := src
|
||||||
INCLUDE_DIR := include
|
INCLUDE_DIR := include
|
||||||
TEST_OBJ_DIR := $(OBJ_DIR)/test
|
TEST_OBJ_DIR := $(OBJ_DIR)/test
|
||||||
TEST_SRC_DIR := src
|
TEST_SRC_DIR := src
|
||||||
INSTALL_HEADER_DIR ?= $(DEVKITPRO)/libogc/include
|
INSTALL_HEADER_DIR ?= $(LIBOGC_INC)
|
||||||
INSTALL_LIB_DIR ?= $(DEVKITPRO)/libogc/lib/wii
|
INSTALL_LIB_DIR ?= $(LIBOGC_LIB)
|
||||||
|
|
||||||
# Tools.
|
# Tools.
|
||||||
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
||||||
|
@ -80,7 +80,7 @@ $(INCLUDE_DIR)/SDL_image.h: $(SRC_DIR)/SDL_image.h
|
||||||
|
|
||||||
# Compilation flags.
|
# Compilation flags.
|
||||||
COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP)
|
COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP)
|
||||||
INCLUDES := -Iinclude -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL -I$(DEVKITPRO)/libogc/include/jpeg
|
INCLUDES := -Iinclude -I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL -I$(LIBOGC_INC)/jpeg
|
||||||
# -I$(DEVKITPRO)/libpng/include
|
# -I$(DEVKITPRO)/libpng/include
|
||||||
DEFINES := -DGEKKO -DDEBUG_ERROR -DDEBUG_TIMERS -DDEBUG_THREADS -DDEBUG_BUILD -DDEBUG_CONVERT -DLOAD_BMP -DLOAD_JPG -DLOAD_GIF -DLOAD_LBM -DLOAD_PCX -DLOAD_PNM -DLOAD_TGA -DLOAD_XCF -DLOAD_XPM -DLOAD_XV -DLOAD_PNG
|
DEFINES := -DGEKKO -DDEBUG_ERROR -DDEBUG_TIMERS -DDEBUG_THREADS -DDEBUG_BUILD -DDEBUG_CONVERT -DLOAD_BMP -DLOAD_JPG -DLOAD_GIF -DLOAD_LBM -DLOAD_PCX -DLOAD_PNM -DLOAD_TGA -DLOAD_XCF -DLOAD_XPM -DLOAD_XV -DLOAD_PNG
|
||||||
#
|
#
|
||||||
|
@ -88,7 +88,7 @@ DEFINES := -DGEKKO -DDEBUG_ERROR -DDEBUG_TIMERS -DDEBUG_THREADS -DDEBUG_BUILD
|
||||||
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
||||||
|
|
||||||
# Test link flags.
|
# Test link flags.
|
||||||
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(DEVKITPRO)/libSDL/lib -L$(DEVKITPRO)/libpng/lib -L$(DEVKITPRO)/libogc/lib/wii -L$(DEVKITPRO)/libjpeg/lib -lSDL_image -lSDL -lpng -ljpeg -lfat -lwiiuse -lbte -logc -lm -lz
|
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(DEVKITPRO)/libSDL/lib -L$(DEVKITPRO)/libpng/lib -L$(LIBOGC_LIB) -L$(DEVKITPRO)/libjpeg/lib -lSDL_image -lSDL -lpng -ljpeg -lfat -lwiiuse -lbte -logc -lm -lz
|
||||||
# -ltiff
|
# -ltiff
|
||||||
|
|
||||||
# How to link an ELF.
|
# How to link an ELF.
|
||||||
|
|
|
@ -17,8 +17,8 @@ SRC_DIR := src
|
||||||
INCLUDE_DIR := include
|
INCLUDE_DIR := include
|
||||||
TEST_OBJ_DIR := $(OBJ_DIR)/test
|
TEST_OBJ_DIR := $(OBJ_DIR)/test
|
||||||
TEST_SRC_DIR := src
|
TEST_SRC_DIR := src
|
||||||
INSTALL_HEADER_DIR ?= $(DEVKITPRO)/libogc/include
|
INSTALL_HEADER_DIR ?= $(LIBOGC_INC)
|
||||||
INSTALL_LIB_DIR ?= $(DEVKITPRO)/libogc/lib/wii
|
INSTALL_LIB_DIR ?= $(LIBOGC_LIB)
|
||||||
|
|
||||||
# Tools.
|
# Tools.
|
||||||
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
||||||
|
@ -82,7 +82,7 @@ $(INCLUDE_DIR)/SDL_mixer.h: $(SRC_DIR)/SDL_mixer.h
|
||||||
|
|
||||||
# Compilation flags.
|
# Compilation flags.
|
||||||
COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP)
|
COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP)
|
||||||
INCLUDES := -Iinclude -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL -I$(DEVKITPRO)/libogc/include/mpeg -I$(DEVKITPRO)/libsmpeg/include -Isrc/mikmod -Isrc/timidity
|
INCLUDES := -Iinclude -I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL -I$(LIBOGC_INC)/mpeg -I$(DEVKITPRO)/libsmpeg/include -Isrc/mikmod -Isrc/timidity
|
||||||
# -include sys/wait.h
|
# -include sys/wait.h
|
||||||
# -include sys/syslimits.h
|
# -include sys/syslimits.h
|
||||||
# -Isrc/native_midi
|
# -Isrc/native_midi
|
||||||
|
@ -94,7 +94,7 @@ DEFINES := -DGEKKO -DDEBUG_ERROR -DDEBUG_TIMERS -DDEBUG_THREADS -DDEBUG_BUILD
|
||||||
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
||||||
|
|
||||||
# Test link flags.
|
# Test link flags.
|
||||||
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(DEVKITPRO)/libogc/lib/wii -L$(DEVKITPRO)/libsmpeg/lib -lSDL_mixer -lsmpeg -lSDL -lfat -lwiiuse -lbte -logc -lm -ltremor
|
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(LIBOGC_LIB) -L$(DEVKITPRO)/libsmpeg/lib -lSDL_mixer -lsmpeg -lSDL -lfat -lwiiuse -lbte -logc -lm -ltremor
|
||||||
|
|
||||||
# How to link an ELF.
|
# How to link an ELF.
|
||||||
$(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL_mixer.a $(DEVKITPRO)/libSDL/lib/libSDL.a
|
$(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL_mixer.a $(DEVKITPRO)/libSDL/lib/libSDL.a
|
||||||
|
|
|
@ -15,8 +15,8 @@ LIB_DIR := lib
|
||||||
BIN_DIR := bin
|
BIN_DIR := bin
|
||||||
SRC_DIR := src
|
SRC_DIR := src
|
||||||
INCLUDE_DIR := include
|
INCLUDE_DIR := include
|
||||||
INSTALL_HEADER_DIR ?= $(DEVKITPRO)/libogc/include
|
INSTALL_HEADER_DIR ?= $(LIBOGC_INC)
|
||||||
INSTALL_LIB_DIR ?= $(DEVKITPRO)/libogc/lib/wii
|
INSTALL_LIB_DIR ?= $(LIBOGC_LIB)
|
||||||
|
|
||||||
# Tools.
|
# Tools.
|
||||||
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
||||||
|
@ -56,7 +56,7 @@ $(INCLUDE_DIR)/SDL_net.h: $(SRC_DIR)/SDL_net.h
|
||||||
|
|
||||||
# Compilation flags.
|
# Compilation flags.
|
||||||
COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP)
|
COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP)
|
||||||
INCLUDES := -Iinclude -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL
|
INCLUDES := -Iinclude -I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL
|
||||||
# -include sys/wait.h
|
# -include sys/wait.h
|
||||||
# -include sys/syslimits.h
|
# -include sys/syslimits.h
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ DEFINES := -DGEKKO
|
||||||
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
||||||
|
|
||||||
# Test link flags.
|
# Test link flags.
|
||||||
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(DEVKITPRO)/libogc/lib/wii -lSDL -lfat -lwiiuse -lbte -logc -lm
|
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(LIBOGC_LIB) -lSDL -lfat -lwiiuse -lbte -logc -lm
|
||||||
|
|
||||||
# How to compile C file (SDL library).
|
# How to compile C file (SDL library).
|
||||||
$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
|
$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
|
||||||
|
|
|
@ -17,8 +17,8 @@ SRC_DIR := src
|
||||||
INCLUDE_DIR := include
|
INCLUDE_DIR := include
|
||||||
TEST_OBJ_DIR := $(OBJ_DIR)/test
|
TEST_OBJ_DIR := $(OBJ_DIR)/test
|
||||||
TEST_SRC_DIR := src
|
TEST_SRC_DIR := src
|
||||||
INSTALL_HEADER_DIR ?= $(DEVKITPRO)/libogc/include
|
INSTALL_HEADER_DIR ?= $(LIBOGC_INC)
|
||||||
INSTALL_LIB_DIR ?= $(DEVKITPRO)/libogc/lib/wii
|
INSTALL_LIB_DIR ?= $(LIBOGC_LIB)
|
||||||
|
|
||||||
# Tools.
|
# Tools.
|
||||||
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
PIPE_TO_SED := 2>&1 | sed "s/:\([0-9]*\):/\(\1\) :/"
|
||||||
|
@ -81,12 +81,12 @@ $(INCLUDE_DIR)/SDL_ttf.h: $(SRC_DIR)/SDL_ttf.h
|
||||||
|
|
||||||
# Compilation flags.
|
# Compilation flags.
|
||||||
COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP)
|
COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP)
|
||||||
INCLUDES := -Iinclude -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL -I$(DEVKITPRO)/libogc/include/freetype
|
INCLUDES := -Iinclude -I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL -I$(LIBOGC_INC)/freetype
|
||||||
DEFINES := -DGEKKO -DDEBUG_ERROR -DDEBUG_TIMERS -DDEBUG_THREADS -DDEBUG_BUILD -DDEBUG_CONVERT
|
DEFINES := -DGEKKO -DDEBUG_ERROR -DDEBUG_TIMERS -DDEBUG_THREADS -DDEBUG_BUILD -DDEBUG_CONVERT
|
||||||
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
||||||
|
|
||||||
# Test link flags.
|
# Test link flags.
|
||||||
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(DEVKITPRO)/libogc/lib/wii -lSDL_ttf -lSDL -lfreetype -lfat -lwiiuse -lbte -logc -lm
|
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(LIBOGC_LIB) -lSDL_ttf -lSDL -lfreetype -lfat -lwiiuse -lbte -logc -lm
|
||||||
|
|
||||||
# How to link an ELF.
|
# How to link an ELF.
|
||||||
$(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL_ttf.a $(DEVKITPRO)/libSDL/lib/libSDL.a
|
$(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL_ttf.a $(DEVKITPRO)/libSDL/lib/libSDL.a
|
||||||
|
|
Reference in a new issue