Changeset 5575:5293c26f7113 in roaraudio

Timestamp:

07/18/12 14:08:01 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Did some win32 porting:

• clean up of old win32 Makefile patching
• Remove tempfiles generated by configure specific to mingw based builds
• Fix -rdynamic bug also for mingw builds (Closes: #269)

Files:

• configure (modified) (5 diffs)
• roard/Makefile (modified) (1 diff)

configure

@@ -48 +48 @@
 fPIC=true
 Wextra=false
+rdynamic=true
 MMCU=''
 LINK_DEPS=full
@@ -1371 +1372 @@
 then
  echo "Adding win32 build arguments..."
+ rdynamic=false
  fPIC=false
  SHARED_SUFFIX='.dll'
@@ -1377 +1379 @@
 then
  echo "Adding cygwin build arguments..."
+ rdynamic=false
  fPIC=false
  SHARED_SUFFIX='.dll'
@@ -1464 +1467 @@
  echo "SHARED_SUFFIX=$SHARED_SUFFIX"
  echo "COMPBIN_SUFFIX=$COMPBIN_SUFFIX"
- $fPIC   && echo 'fPIC=-fPIC'
- $Wextra && echo 'Wextra=-Wextra'
+ $rdynamic && echo 'rdynamic=-rdynamic'
+ $fPIC     && echo 'fPIC=-fPIC'
+ $Wextra   && echo 'Wextra=-Wextra'
  echo
  echo "CC=$CC"
@@ -2711 +2715 @@
 echo 'config.h created and moved into include/roaraudio/'
 
-if $TARGET_CYGWIN
-then
+if [ "$TARGET_CYGWIN" = 'true' -o "$TARGET_WIN32" = 'true' ]
+then
+ echo "Deleting win32 specific temp files: $TF_E.exe"
  rm -f $TF_E.exe
- echo 'patching Makefiles for cygwin...'
- find . -name Makefile -print0 | xargs -0 sed 's/\.so/.dll/g; s/-rdynamic//g' -i
 fi
 

roard/Makefile

@@ -18 +18 @@
 INCLUDE   = -I../include -I./include
 CFLAGS   += -g -Wall $(OPTI_O) $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH)
-LDFLAGS  += -g -Wall -rdynamic -L../lib/ $(LDPATH)
+LDFLAGS  += -g -Wall $(rdynamic) -L../lib/ $(LDPATH)
 DRVLIBS   = $(lib_esd) $(lib_ossaudio) $(lib_ao) $(lib_shout) $(lib_sndio) $(lib_rsound) $(lib_portaudio) $(lib_pablio) $(lib_asound) $(lib_winmm) $(lib_pulse_simple) $(lib_pulse) $(lib_jack) $(lib_artsc)
 CODEC_CELT= $(lib_celt) $(lib_celt0)