[PD-cvs] externals Makefile,1.20,1.21

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/externals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11346

Modified Files:
	Makefile 
Log Message:
more MinGW fixes

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile	13 Dec 2005 21:49:49 -0000	1.20
--- Makefile	14 Dec 2005 00:32:04 -0000	1.21
***************
*** 38,67 ****
  #==============================================================================#
  
! OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
! CFLAGS = -DPD -DUNIX -Dunix $(OPT_CFLAGS) -I$(pd_src)/src\
!     -Wall -W -Wno-unused -Wno-parentheses -Wno-switch -Wno-shadow \
! 	-I$(pd_src)/src
  LDFLAGS =  
! LIBS = 
  
  ifeq ($(OS_NAME),darwin)
!   CFLAGS += -I/sw/include
    LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib
    STRIP = echo
  else
    ifeq ($(OS_NAME),win)
!     CFLAGS += -mms-bitfields -D'O_NONBLOCK=1' \
!       -D'drand48()=((double)rand()/RAND_MAX)' -D'srand48(n)=srand((n))'
!     LDFLAGS += -shared
!     LIBS += -L$(PD_PATH)/bin -lpd
  # These don't seem to be needed:
- #	-D'bzero(p,n)=memset(p,0,n)' \
  #	-D'PROT_READ=1' \
  #	-D'MAP_PRIVATE=2' \
  #	-D'O_NDELAY=O_NONBLOCK'
      STRIP = strip --strip-unneeded -R .note -R .comment
    else
!     CFLAGS += -fPIC
      LDFLAGS += -Wl,-export_dynamic  -shared
      STRIP = strip --strip-unneeded -R .note -R .comment
    endif
--- 38,70 ----
  #==============================================================================#
  
! OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -fstrict-aliasing
! 
! CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src \
! 	-Wall -W -Wno-unused -Wno-parentheses -Wno-switch -Wno-shadow
  LDFLAGS =  
! LIBS = -lm
  
  ifeq ($(OS_NAME),darwin)
!   CFLAGS += -I/sw/include -DMACOSX -DUNIX -Dunix
    LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib
+   LIBS += -lc
    STRIP = echo
  else
    ifeq ($(OS_NAME),win)
! 	 WINDOWS_HACKS = -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \
! 		-D'setenv(a,b,c)=_putenv(a)' \
!       -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)'
  # These don't seem to be needed:
  #	-D'PROT_READ=1' \
  #	-D'MAP_PRIVATE=2' \
  #	-D'O_NDELAY=O_NONBLOCK'
+     CFLAGS += -mms-bitfields -DMSW -DNT -DWIN32 $(WINDOWS_HACKS)
+     LDFLAGS += -shared
+     LIBS += -L$(pd_src)/bin -lpd -lwsock32 -lpthreadGC2
      STRIP = strip --strip-unneeded -R .note -R .comment
    else
!     CFLAGS +=  -DUNIX -Dunix -fPIC
      LDFLAGS += -Wl,-export_dynamic  -shared
+     LIBS += -lc
      STRIP = strip --strip-unneeded -R .note -R .comment
    endif
***************
*** 72,76 ****
  
  %.$(EXTENSION): %.o
! 	$(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" -lc -lm  $(LIBS) \
  		`test -f $*.libs && cat $*.libs`	\
  		`test -f $(dir $*)../$(OS_NAME)/$(notdir $*).libs && \
--- 75,79 ----
  
  %.$(EXTENSION): %.o
! 	$(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o"  $(LIBS) \
  		`test -f $*.libs && cat $*.libs`	\
  		`test -f $(dir $*)../$(OS_NAME)/$(notdir $*).libs && \