Skip to content

Commit

Permalink
update for r18
Browse files Browse the repository at this point in the history
  • Loading branch information
dborth committed Oct 9, 2009
1 parent a9f304a commit ebb974c
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 44 deletions.
7 changes: 3 additions & 4 deletions SDL/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 ----

Expand All @@ -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)
5 changes: 2 additions & 3 deletions SDL/Makefile.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----

Expand All @@ -53,12 +52,12 @@ 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

# How to compile C file (Tests).
$(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)
1 change: 0 additions & 1 deletion SDL/SDL.pnproj
View file

This file was deleted.

6 changes: 3 additions & 3 deletions SDL_gfx/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
1 change: 0 additions & 1 deletion SDL_gfx/SDL_gfx.pnproj
View file

This file was deleted.

16 changes: 8 additions & 8 deletions SDL_image/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 ----

Expand All @@ -85,28 +85,28 @@ 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

# How to compile C file (Tests).
$(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)
1 change: 0 additions & 1 deletion SDL_image/SDL_image.pnproj
View file

This file was deleted.

15 changes: 7 additions & 8 deletions SDL_mixer/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 ----

Expand All @@ -91,27 +90,27 @@ 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

# How to compile C file (Tests).
$(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)
1 change: 0 additions & 1 deletion SDL_mixer/SDL_mixer.pnproj
View file

This file was deleted.

6 changes: 3 additions & 3 deletions SDL_net/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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)
1 change: 0 additions & 1 deletion SDL_net/SDL_net.pnproj
View file

This file was deleted.

13 changes: 6 additions & 7 deletions SDL_ttf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 ----

Expand All @@ -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
Expand All @@ -92,18 +91,18 @@ 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

# How to compile C file (Tests).
$(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)
1 change: 0 additions & 1 deletion SDL_ttf/SDL_ttf.pnproj
View file

This file was deleted.

4 changes: 2 additions & 2 deletions smpeg/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit ebb974c

Please sign in to comment.