diff options
author | Stanislav Brabec <utx@penguin.cz> | 2008-02-19 22:59:18 +0000 |
---|---|---|
committer | Stanislav Brabec <utx@penguin.cz> | 2008-02-19 22:59:18 +0000 |
commit | 62adfb2470ab84c106ad6fe4e169620f1477beb0 (patch) | |
tree | 592aad5f9bda6ad3f993e151ddf9e9795b5a5436 /packages/libsdl/files/fixlibs-1.2.9.patch | |
parent | 74a532e4bc5f8b037d050a0a1fb66ea35eeac1ec (diff) | |
parent | 2999625c9793012541dee694ef993d35e630af1f (diff) |
merge of '9a5df4f82194968b8ea8a94d7effc5bf61c1e650'
and 'cb1970d64a9cdb9559e137f509557905fbc174b5'
Diffstat (limited to 'packages/libsdl/files/fixlibs-1.2.9.patch')
-rw-r--r-- | packages/libsdl/files/fixlibs-1.2.9.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/packages/libsdl/files/fixlibs-1.2.9.patch b/packages/libsdl/files/fixlibs-1.2.9.patch new file mode 100644 index 0000000000..ebc6ec7769 --- /dev/null +++ b/packages/libsdl/files/fixlibs-1.2.9.patch @@ -0,0 +1,27 @@ +diff -Naur SDL-1.2.9-orig/configure.in SDL-1.2.9/configure.in +--- SDL-1.2.9-orig/configure.in 2007-03-12 20:56:23.000000000 +0100 ++++ SDL-1.2.9/configure.in 2007-03-12 20:59:28.000000000 +0100 +@@ -1593,8 +1593,8 @@ + AC_MSG_RESULT($video_qtopia) + if test x$video_qtopia = xyes; then + CFLAGS="$CFLAGS -DENABLE_QTOPIA -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -I${QPEDIR}/include -I${QTDIR}/include/ -DNO_DEBUG -fno-rtti -fno-exceptions" +- SDL_LIBS="$SDL_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte" +- SDL_CFLAGS="$SDL_CFLAGS -DQWS" ++ SDL_LIBS="$SDL_LIBS -Wl,-rpath-link -Wl,${QPEDIR}/lib -Wl,-rpath-link -Wl,${QTDIR}/lib" ++ SYSTEM_LIBS="$SYSTEM_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte-mt" + VIDEO_SUBDIRS="$VIDEO_SUBDIRS qtopia" + VIDEO_DRIVERS="$VIDEO_DRIVERS qtopia/libvideo_qtopia.la" + else +@@ -1908,12 +1908,6 @@ + CheckAltivec + CheckLinuxVersion + CheckRPATH +- +- # Set up files for the main() stub +- if test "x$video_qtopia" = "xyes"; then +- SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" +- +- fi + # Set up files for the audio library + # We use the OSS and ALSA API's, not the Sun audio API + #if test x$enable_audio = xyes; then |