diff options
| author | N.N. <matju@users.sourceforge.net> | 2009-05-26 05:41:06 +0000 |
|---|---|---|
| committer | N.N. <matju@users.sourceforge.net> | 2009-05-26 05:41:06 +0000 |
| commit | 3e9867edabd68bfd6474ff8c84c54c67af0a5d35 (patch) | |
| tree | 65f541b4d4bccad3446c102557464ab3b9b8fa87 | |
| parent | d610612a50bb73f965858b3ea4b20d4984f8fad6 (diff) | |
goes with last configure.in
svn path=/trunk/; revision=11505
| -rwxr-xr-x | desiredata/src/configure | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/desiredata/src/configure b/desiredata/src/configure index 3041594a..aae7a853 100755 --- a/desiredata/src/configure +++ b/desiredata/src/configure @@ -5296,7 +5296,9 @@ MIDISRC="s_midi_none.c" WLIB="" STRIP="meuhhhhh" -if test `uname -s` = Linux; then +OS=MINGW32 + +if test $OS = Linux; then LDFLAGS="-Wl,-export-dynamic " EXT=pd_linux LIBSUFFIX=.so @@ -5310,7 +5312,7 @@ if test `uname -s` = Linux; then WSTRIP="" fi -if test `uname -s` = Darwin; then +if test $OS = Darwin; then LDFLAGS="" EXT=pd_darwin LIBSUFFIX=.dylib @@ -5338,7 +5340,7 @@ if test `uname -s` = Darwin; then WSTRIP="" fi -if test `uname -s | cut -f1 -d_` = CYGWIN; then +if test $(echo $OS | cut -f1 -d_) = CYGWIN; then LDFLAGS="-Wl,-export-dynamic " EXT=dll LIBSUFFIX=.dll @@ -5350,8 +5352,9 @@ if test `uname -s | cut -f1 -d_` = CYGWIN; then WSTRIP="" fi -if test `uname -s | cut -f1 -d_` = MINGW32; then - LDFLAGS="-lm -lpthreadGC2 -lwsock32 -lwinmm -lole32 -L../src -lpd" +if test $(echo $OS | cut -f1 -d_) = MINGW32; then +# LDFLAGS="-lm -lpthreadGC2 -lwsock32 -lwinmm -lole32 -L../src -lpd" + LDFLAGS="-lm /home/matju/pthreads-mingw/lib/libpthreadGC2.a -lwsock32 -lwinmm -lole32 -L../src -lpd" EXT=dll LIBSUFFIX=.dll CPPFLAGS="-DMSW \ @@ -5359,11 +5362,10 @@ if test `uname -s | cut -f1 -d_` = MINGW32; then MORECFLAGS="-mms-bitfields" STRIPFLAG=-s LDSOFLAGS="-shared" -# AUDIOSRC="s_audio_mmio.c" + AUDIOSRC="s_audio_mmio.c" MIDISRC="s_midi_mmio.c" - STRIP="strip --strip-unneeded -R .note -R .comment" - EXPORT="-Wl, --export-all-symbols -Wl, --out-implib=pd.a" + EXPORT="-Wl,--export-all-symbols -Wl,--out-implib=pd.a" WLIB=$WLIB"$LDFLAGS $EXPORT; $STRIP libpd.dll" EXE=.exe WATCHDOG=pd.com |