From ebb974cbe5ba59cb9b0dd56b01541cba92a4b2f8 Mon Sep 17 00:00:00 2001 From: dborth Date: Fri, 9 Oct 2009 05:16:20 +0000 Subject: [PATCH] update for r18 --- SDL/Makefile | 7 +++---- SDL/Makefile.test | 5 ++--- SDL/SDL.pnproj | 1 - SDL_gfx/Makefile | 6 +++--- SDL_gfx/SDL_gfx.pnproj | 1 - SDL_image/Makefile | 16 ++++++++-------- SDL_image/SDL_image.pnproj | 1 - SDL_mixer/Makefile | 15 +++++++-------- SDL_mixer/SDL_mixer.pnproj | 1 - SDL_net/Makefile | 6 +++--- SDL_net/SDL_net.pnproj | 1 - SDL_ttf/Makefile | 13 ++++++------- SDL_ttf/SDL_ttf.pnproj | 1 - smpeg/Makefile | 4 ++-- 14 files changed, 34 insertions(+), 44 deletions(-) delete mode 100644 SDL/SDL.pnproj delete mode 100644 SDL_gfx/SDL_gfx.pnproj delete mode 100644 SDL_image/SDL_image.pnproj delete mode 100644 SDL_mixer/SDL_mixer.pnproj delete mode 100644 SDL_net/SDL_net.pnproj delete mode 100644 SDL_ttf/SDL_ttf.pnproj diff --git a/SDL/Makefile b/SDL/Makefile index ae45bc0..4edb4ba 100644 --- a/SDL/Makefile +++ b/SDL/Makefile @@ -57,7 +57,7 @@ clean: @echo Cleaning $(LIB_DIR) $(SDL_OBJS) @rm -fr $(LIB_DIR) $(SDL_OBJS) -install: +install: all @mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR) @mkdir -p $(INSTALL_HEADER_DIR)/SDL @cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR) @@ -76,14 +76,13 @@ test-clean: $(LIB_DIR)/libSDL.a: $(SDL_OBJS) @echo Archiving $@ @-mkdir -p $(dir $@) - powerpc-gekko-ar crs $@ $(SDL_OBJS) + powerpc-eabi-ar crs $@ $(SDL_OBJS) @echo ---- # How to build a DOL. $(BIN_DIR)/%.dol: $(TEST_OBJ_DIR)/%.elf @echo Creating DOL $@ @-mkdir -p $(dir $@) - #powerpc-gekko-objcopy -O binary $< $@ elf2dol $< $@ @echo ---- @@ -100,4 +99,4 @@ LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(LIBOGC_LIB) -lSDL -lwiikeyboard -l $(SDL_OBJ_DIR)/%.o: $(SDL_SRC_DIR)/%.c @echo Compiling $< @-mkdir -p $(dir $@) - powerpc-gekko-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) + powerpc-eabi-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) diff --git a/SDL/Makefile.test b/SDL/Makefile.test index be3c6c0..d94818e 100644 --- a/SDL/Makefile.test +++ b/SDL/Makefile.test @@ -34,7 +34,6 @@ clean: $(BIN_DIR)/%.dol: $(TEST_OBJ_DIR)/%.elf @echo Creating DOL $@ @-mkdir -p $(dir $@) - #powerpc-gekko-objcopy -O binary $< $@ elf2dol $< $@ @echo ---- @@ -53,7 +52,7 @@ LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(DEVKITPRO)/libogc/lib/wii -lSDL -l $(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL.a @echo Linking $@ @-mkdir -p $(dir $@) - powerpc-gekko-g++ -o $@ $< $(LDFLAGS) + powerpc-eabi-g++ -o $@ $< $(LDFLAGS) #keep elf for debugging #cp $@ /tmp/elf @@ -61,4 +60,4 @@ $(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL.a $(TEST_OBJ_DIR)/%.o: $(TEST_SRC_DIR)/%.c @echo Compiling $< @-mkdir -p $(dir $@) - powerpc-gekko-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SsED) + powerpc-eabi-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SsED) diff --git a/SDL/SDL.pnproj b/SDL/SDL.pnproj deleted file mode 100644 index b557fb6..0000000 --- a/SDL/SDL.pnproj +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/SDL_gfx/Makefile b/SDL_gfx/Makefile index 267f862..3ee58a5 100644 --- a/SDL_gfx/Makefile +++ b/SDL_gfx/Makefile @@ -41,10 +41,10 @@ clean: $(LIB_DIR)/libSDL_gfx.a: $(OBJS) @echo Archiving $@ @-mkdir -p $(dir $@) - @powerpc-gekko-ar crs $@ $(OBJS) + @powerpc-eabi-ar crs $@ $(OBJS) @echo ---- -install: +install: all @mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR) @mkdir -p $(INSTALL_HEADER_DIR)/SDL @cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR) @@ -66,4 +66,4 @@ CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c @echo Compiling $< @-mkdir -p $(dir $@) - @powerpc-gekko-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) + @powerpc-eabi-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) diff --git a/SDL_gfx/SDL_gfx.pnproj b/SDL_gfx/SDL_gfx.pnproj deleted file mode 100644 index fd2448d..0000000 --- a/SDL_gfx/SDL_gfx.pnproj +++ /dev/null @@ -1 +0,0 @@ - diff --git a/SDL_image/Makefile b/SDL_image/Makefile index bb8c856..a269207 100644 --- a/SDL_image/Makefile +++ b/SDL_image/Makefile @@ -46,7 +46,7 @@ clean: @echo Cleaning $(LIB_DIR)/libSDL_image.a $(OBJ_DIR) @rm -f $(LIB_DIR)/libSDL_image.a $(OBJS) $(TEST_OBJS) -install: +install: all @mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR) @mkdir -p $(INSTALL_HEADER_DIR)/SDL @cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR) @@ -61,14 +61,14 @@ test-install: $(TEST_DOLS) $(LIB_DIR)/libSDL_image.a: $(OBJS) @echo Archiving $@ @-mkdir -p $(dir $@) - @powerpc-gekko-ar crs $@ $(OBJS) + @powerpc-eabi-ar crs $@ $(OBJS) @echo ---- # How to build a DOL. $(BIN_DIR)/%.dol: $(TEST_OBJ_DIR)/%.elf @echo Creating DOL $@ @-mkdir -p $(dir $@) - #powerpc-gekko-objcopy -O binary $< $@ + #powerpc-eabi-objcopy -O binary $< $@ elf2dol $< $@ @echo ---- @@ -85,17 +85,17 @@ INCLUDES := -Iinclude -I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL -I$(LIBOGC_INC)/jpeg 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 # # -DLOAD_TIFF -CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) +CFLAGS := -L$(PORTLIBS)/lib -I$(PORTLIBS)/include $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) # Test link flags. -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 +LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(LIBOGC_LIB) -lSDL_image -lSDL -lpng -ljpeg -lfat -lwiiuse -lbte -logc -lm -lz # -ltiff # How to link an ELF. $(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL_image.a $(DEVKITPRO)/libSDL/lib/libSDL.a @echo Linking $@ @-mkdir -p $(dir $@) - powerpc-gekko-g++ -o $@ $< $(LDFLAGS) + powerpc-eabi-g++ -o $@ $< $(LDFLAGS) #keep elf for debugging #cp $@ /tmp/elf @@ -103,10 +103,10 @@ $(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL_image.a $(DEVKITPRO $(TEST_OBJ_DIR)/%.o: $(TEST_SRC_DIR)/showimage.c @echo Compiling $< @-mkdir -p $(dir $@) - powerpc-gekko-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) + powerpc-eabi-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) # How to compile C file (SDL library). $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c @echo Compiling $< @-mkdir -p $(dir $@) - @powerpc-gekko-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) + @powerpc-eabi-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) diff --git a/SDL_image/SDL_image.pnproj b/SDL_image/SDL_image.pnproj deleted file mode 100644 index 8cd7ba7..0000000 --- a/SDL_image/SDL_image.pnproj +++ /dev/null @@ -1 +0,0 @@ - diff --git a/SDL_mixer/Makefile b/SDL_mixer/Makefile index 50e302e..81b7eaa 100644 --- a/SDL_mixer/Makefile +++ b/SDL_mixer/Makefile @@ -53,7 +53,7 @@ clean: @echo Cleaning $(LIB_DIR)/libSDL_mixer.a $(OBJ_DIR) @rm -f $(LIB_DIR)/libSDL_mixer.a $(OBJS) $(TEST_OBJS) -install: +install: all @mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR) @mkdir -p $(INSTALL_HEADER_DIR)/SDL @cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR) @@ -63,14 +63,13 @@ install: $(LIB_DIR)/libSDL_mixer.a: $(OBJS) @echo Archiving $@ @-mkdir -p $(dir $@) - @powerpc-gekko-ar crs $@ $(OBJS) + @powerpc-eabi-ar crs $@ $(OBJS) @echo ---- # How to build a DOL. $(BIN_DIR)/%.dol: $(TEST_OBJ_DIR)/%.elf @echo Creating DOL $@ @-mkdir -p $(dir $@) - #powerpc-gekko-objcopy -O binary $< $@ elf2dol $< $@ @echo ---- @@ -91,16 +90,16 @@ DEFINES := -DGEKKO -DDEBUG_ERROR -DDEBUG_TIMERS -DDEBUG_THREADS -DDEBUG_BUILD # -DOGG_MUSIC # # -DCMD_MUSIC -CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) +CFLAGS := -L$(PORTLIBS)/lib -I$(PORTLIBS)/include $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) # Test link flags. -LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(LIBOGC_LIB) -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 -lvorbisidec # How to link an ELF. $(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL_mixer.a $(DEVKITPRO)/libSDL/lib/libSDL.a @echo Linking $@ @-mkdir -p $(dir $@) - powerpc-gekko-g++ -o $@ $< $(LDFLAGS) + powerpc-eabi-g++ -o $@ $< $(LDFLAGS) #keep elf for debugging #cp $@ /tmp/elf @@ -108,10 +107,10 @@ $(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL_mixer.a $(DEVKITPRO $(TEST_OBJ_DIR)/%.o: $(TEST_SRC_DIR)/playmus.c $(TEST_SRC_DIR)/playwave.c @echo Compiling $< @-mkdir -p $(dir $@) - powerpc-gekko-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) + powerpc-eabi-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) # How to compile C file (SDL library). $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c @echo Compiling $< @-mkdir -p $(dir $@) - @powerpc-gekko-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) + @powerpc-eabi-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) diff --git a/SDL_mixer/SDL_mixer.pnproj b/SDL_mixer/SDL_mixer.pnproj deleted file mode 100644 index 32522aa..0000000 --- a/SDL_mixer/SDL_mixer.pnproj +++ /dev/null @@ -1 +0,0 @@ - diff --git a/SDL_net/Makefile b/SDL_net/Makefile index 73c38e7..24ad72e 100644 --- a/SDL_net/Makefile +++ b/SDL_net/Makefile @@ -35,7 +35,7 @@ clean: @echo Cleaning $(LIB_DIR)/libSDL_net.a $(OBJ_DIR) @rm -f $(LIB_DIR)/libSDL_net.a $(OBJS) $(TEST_OBJS) -install: +install: all @mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR) @mkdir -p $(INSTALL_HEADER_DIR)/SDL @cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR) @@ -45,7 +45,7 @@ install: $(LIB_DIR)/libSDL_net.a: $(OBJS) @echo Archiving $@ @-mkdir -p $(dir $@) - @powerpc-gekko-ar crs $@ $(OBJS) + @powerpc-eabi-ar crs $@ $(OBJS) @echo ---- # How to copy a header file @@ -71,4 +71,4 @@ LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(LIBOGC_LIB) -lSDL -lfat -lwiiuse - $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c @echo Compiling $< @-mkdir -p $(dir $@) - @powerpc-gekko-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) + @powerpc-eabi-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) diff --git a/SDL_net/SDL_net.pnproj b/SDL_net/SDL_net.pnproj deleted file mode 100644 index 7a0d859..0000000 --- a/SDL_net/SDL_net.pnproj +++ /dev/null @@ -1 +0,0 @@ - diff --git a/SDL_ttf/Makefile b/SDL_ttf/Makefile index a009413..40248b8 100644 --- a/SDL_ttf/Makefile +++ b/SDL_ttf/Makefile @@ -52,7 +52,7 @@ test-install: $(TEST_DOLS) @-mkdir -p dols cp $(TEST_DOLS) dols -install: +install: all @mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR) @mkdir -p $(INSTALL_HEADER_DIR)/SDL @cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR) @@ -62,14 +62,13 @@ install: $(LIB_DIR)/libSDL_ttf.a: $(OBJS) @echo Archiving $@ @-mkdir -p $(dir $@) - @powerpc-gekko-ar crs $@ $(OBJS) + @powerpc-eabi-ar crs $@ $(OBJS) @echo ---- # How to build a DOL. $(BIN_DIR)/%.dol: $(TEST_OBJ_DIR)/%.elf @echo Creating DOL $@ @-mkdir -p $(dir $@) - #powerpc-gekko-objcopy -O binary $< $@ elf2dol $< $@ @echo ---- @@ -83,7 +82,7 @@ $(INCLUDE_DIR)/SDL_ttf.h: $(SRC_DIR)/SDL_ttf.h COMMON_FLAGS := -g -O3 -mrvl -Wall $(MACHDEP) 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 -CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) +CFLAGS := -L$(PORTLIBS)/lib -I$(PORTLIBS)/include -I$(PORTLIBS)/include/freetype2 $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) # Test link flags. LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(LIBOGC_LIB) -lSDL_ttf -lSDL -lfreetype -lfat -lwiiuse -lbte -logc -lm @@ -92,7 +91,7 @@ LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(LIBOGC_LIB) -lSDL_ttf -lSDL -lfree $(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL_ttf.a $(DEVKITPRO)/libSDL/lib/libSDL.a @echo Linking $@ @-mkdir -p $(dir $@) - powerpc-gekko-g++ -o $@ $< $(LDFLAGS) + powerpc-eabi-g++ -o $@ $< $(LDFLAGS) #keep elf for debugging #cp $@ /tmp/elf @@ -100,10 +99,10 @@ $(TEST_OBJ_DIR)/%.elf: $(TEST_OBJ_DIR)/%.o $(LIB_DIR)/libSDL_ttf.a $(DEVKITPRO)/ $(TEST_OBJ_DIR)/%.o: $(TEST_SRC_DIR)/showfont.c @echo Compiling $< @-mkdir -p $(dir $@) - powerpc-gekko-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) + powerpc-eabi-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) # How to compile C file (SDL library). $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c @echo Compiling $< @-mkdir -p $(dir $@) - @powerpc-gekko-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) + @powerpc-eabi-gcc $(CFLAGS) -c $< -o $@ $(PIPE_TO_SED) diff --git a/SDL_ttf/SDL_ttf.pnproj b/SDL_ttf/SDL_ttf.pnproj deleted file mode 100644 index 4f8909a..0000000 --- a/SDL_ttf/SDL_ttf.pnproj +++ /dev/null @@ -1 +0,0 @@ - diff --git a/smpeg/Makefile b/smpeg/Makefile index 7ec11de..9240aae 100644 --- a/smpeg/Makefile +++ b/smpeg/Makefile @@ -30,7 +30,7 @@ INSTALL_LIB_DIR ?= $(LIBOGC_LIB) # options for code generation #--------------------------------------------------------------------------------- -CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -DDISABLE_VIDEO_CALLBACK_THREAD -DNOCONTROLS +CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DDISABLE_VIDEO_CALLBACK_THREAD -DNOCONTROLS CXXFLAGS = $(CFLAGS) -DDISABLE_VIDEO_CALLBACK_THREAD -DNOCONTROLS LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map @@ -113,7 +113,7 @@ $(BUILD): clean: @rm -fr $(BUILD) $(OUTPUT).a -install: +install: $(BUILD) @mkdir -p $(INSTALL_HEADER_DIR) $(INSTALL_LIB_DIR) @mkdir -p $(INSTALL_HEADER_DIR)/mpeg @cp -frv $(LIB_DIR)/*.* $(INSTALL_LIB_DIR)