* fix portlibs in the makefile, yet again

This commit is contained in:
giantpune 2012-02-06 01:28:42 +00:00
parent c7411c9200
commit df7022870c
3 changed files with 5 additions and 5 deletions

View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>2.3 r1150</version> <version>2.3 r1151</version>
<release_date>201202051825</release_date> <release_date>201202060127</release_date>
<!-- // remove this line to enable arguments <!-- // remove this line to enable arguments
<arguments> <arguments>
<arg>--ios=250</arg> <arg>--ios=250</arg>

View File

@ -134,14 +134,14 @@ export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-I$(CURDIR)/$(BUILD) -I$(LIBOGC_INC) \ -I$(CURDIR)/$(BUILD) -I$(LIBOGC_INC) \
-I$(PORTLIBS) -I$(PORTLIBS)/include/freetype2 -I$(PORTLIBS)/include -I$(PORTLIBS)/include/freetype2
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# build a list of library paths # build a list of library paths
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) -L$(CURDIR)/source/libs/libfat/ \ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) -L$(CURDIR)/source/libs/libfat/ \
-L$(CURDIR)/source/libs/libntfs/ -L$(CURDIR)/source/libs/libext2fs/ \ -L$(CURDIR)/source/libs/libntfs/ -L$(CURDIR)/source/libs/libext2fs/ \
-L$(LIBOGC_LIB) -L$(PORTLIBS) -L$(LIBOGC_LIB) -L$(PORTLIBS)/lib
export OUTPUT := $(CURDIR)/$(TARGET) export OUTPUT := $(CURDIR)/$(TARGET)
.PHONY: $(BUILD) lang all clean .PHONY: $(BUILD) lang all clean

View File

@ -38,7 +38,7 @@ u8 * uncompressLZ77(const u8 *inBuf, u32 inLength, u32 * size)
if (*((const u32 *)inBuf) != 0x4C5A3737 /*"LZ77"*/) if (*((const u32 *)inBuf) != 0x4C5A3737 /*"LZ77"*/)
return NULL; return NULL;
decompressLZ77content(inBuf + 4, inLength - 4, &buffer, size); decompressLZ77content( (u8*)inBuf + 4, inLength - 4, &buffer, size);
return buffer; return buffer;
} }