diff options
| author | truelight <truelight@openttd.org> | 2007-02-11 16:28:00 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2007-02-11 16:28:00 +0000 |
| commit | 4b88663f3177e64bfcc039ef9ed7481922cb7098 (patch) | |
| tree | a80f0bfecab1f32d0d6f8a699498e8fe1e803ef6 | |
| parent | c18454bf1c8715f9ed916314869e971e528ee0de (diff) | |
| download | openttd-4b88663f3177e64bfcc039ef9ed7481922cb7098.tar.xz | |
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
-Fix: PSP needs to link with gcc, not with g++ (don't ask)
-Fix: PSP doens't support threads
| -rw-r--r-- | Makefile.src.in | 4 | ||||
| -rw-r--r-- | config.lib | 6 | ||||
| -rw-r--r-- | src/thread.cpp | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.src.in b/Makefile.src.in index 70a31d4b9..9d0980d9a 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -224,7 +224,11 @@ $(BIN_DIR)/$(TTD): $(TTD) $(TTD): rev.o $(OBJS) $(CONFIG_CACHE_LINKER) $(E) '$(STAGE) Linking $@' +ifeq ($(OS), PSP) + $(Q)$(CC_HOST) $(LDFLAGS) rev.o $(OBJS) $(LIBS) -o $@ +else $(Q)$(CXX_HOST) $(LDFLAGS) rev.o $(OBJS) $(LIBS) -o $@ +endif ifdef STRIP $(Q)$(STRIP) $@ endif diff --git a/config.lib b/config.lib index 63bc9f04b..281f9d368 100644 --- a/config.lib +++ b/config.lib @@ -606,6 +606,9 @@ make_cflags_and_ldflags() { # Each debug level reduces the optimalization by a bit if [ $enable_debug -ge 1 ]; then CFLAGS="$CFLAGS -g -D_DEBUG" + if [ "$os" = "PSP" ]; then + CFLAGS="$CFLAGS -G0" + fi fi if [ $enable_debug -ge 2 ]; then CFLAGS="$CFLAGS -fno-inline" @@ -668,6 +671,9 @@ make_cflags_and_ldflags() { if [ "$os" = "PSP" ]; then CFLAGS="$CFLAGS -I`$psp_config -p`/include" LDFLAGS="$LDFLAGS -L`$psp_config -p`/lib" + + CFLAGS="$CFLAGS -fno-exceptions -fno-rtti -D_PSP_FW_VERSION=150" + LIBS="$LIBS -D_PSP_FW_VERSION=150 -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lpspnet -lpspnet_inet -lpspnet_apctl -lpspnet_resolver -lpsputility -lpspuser -lpspkernel -lm" fi if [ "$os" = "MORPHOS" ]; then diff --git a/src/thread.cpp b/src/thread.cpp index 66456d1ab..06ebe929c 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -5,7 +5,7 @@ #include <stdlib.h> #include "helpers.hpp" -#if defined(__AMIGA__) || defined(__MORPHOS__) || defined(NO_THREADS) +#if defined(__AMIGA__) || defined(__MORPHOS__) || defined(PSP) || defined(NO_THREADS) OTTDThread *OTTDCreateThread(OTTDThreadFunc function, void *arg) { return NULL; } void *OTTDJoinThread(OTTDThread *t) { return NULL; } void OTTDExitThread(void) { NOT_REACHED(); }; |