Update of /cvsroot/pure-data/externals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19660
Modified Files:
Makefile
Log Message:
lots of MinGW fixes for RC6
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Makefile 16 Dec 2005 17:30:06 -0000 1.24
--- Makefile 18 Dec 2005 18:57:13 -0000 1.25
***************
*** 38,42 ****
#==============================================================================#
! OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -fstrict-aliasing
CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src \
--- 38,42 ----
#==============================================================================#
! OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer
CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src \
***************
*** 53,57 ****
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:
--- 53,56 ----
***************
*** 59,65 ****
# -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
--- 58,68 ----
# -D'MAP_PRIVATE=2' \
# -D'O_NDELAY=O_NONBLOCK'
! # -D'setenv(a,b,c)=_putenv(a)'
! CFLAGS += -mms-bitfields -DMSW -DNT $(WINDOWS_HACKS)
LDFLAGS += -shared
! # all of these included libs are part of libc in UNIX platforms. All except
! # libregex are in DLLs, so they get stripped from the external's .dll binary
! LIBS += -L$(pd_src)/bin -lpd \
! -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex
STRIP = strip --strip-unneeded -R .note -R .comment
else
***************
*** 95,107 ****
# ALL
! #TARGETS = creb cxc cyclone ext13 freeverb hid iemabs iemlib \
! #iemmatrix loaders markex maxlib mjlib motex pddp pdp pmpd smlib toxy vbap zexy
! #$(patsubst %, %_install,$(TARGETS))
! BUILDSRC_OBJECTS := $(wildcard $(externals_src)/build/src/*.c)
! all: pre_all_$(OS_NAME) $(BUILDSRC_OBJECTS:.c=.$(EXTENSION)) \
! creb cxc cyclone ext13 freeverb \
! hid iemabs iemlib iemmatrix loaders markex maxlib mjlib motex pddp pdp \
! pmpd smlib toxy unauthorized vbap zexy
@echo " "
@echo "Compiled external for $(OS_NAME) aka $(UNAME)"
--- 98,107 ----
# ALL
! LIB_TARGETS = buildsrc creb cxc cyclone ext13 freeverb hid iemabs iemlib \
! iemmatrix loaders markex maxlib mjlib motex pddp pdp pmpd smlib toxy \
! unauthorized vbap zexy
!
! all: pre_all_$(OS_NAME) buildsrc $(LIB_TARGETS)
@echo " "
@echo "Compiled external for $(OS_NAME) aka $(UNAME)"
***************
*** 120,145 ****
#------------------------------------------------------------------------------#
# INSTALL
! install: $(objectsdir) all help_install objects_install unfiltered_install \
! creb_install cxc_install cyclone_install ext13_install freeverb_install\
! iemabs_install iemabs_install iemlib_install iemmatrix_install loaders_install \
! markex_install maxlib_install mjlib_install motex_install pddp_install \
! pdp_install pidip_install pmpd_install toxy_install unauthorized_install \
! vbap_install zexy_install
@echo " "
@echo "externals install succeeded!"
- objects_install:
- install -p $(BUILDSRC_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)
-
#==============================================================================#
#
! # INSTALL TARGETS
#
#==============================================================================#
! help_install: $(helpdir)
! #------------------------------------------------------------------------------#
# all standard objs' help files
# it had to be broken up because the list is soo long
--- 120,145 ----
#------------------------------------------------------------------------------#
# INSTALL
! install: $(examplesdir) $(helpdir) $(manualsdir) $(objectsdir) \
! all unfiltered_install $(patsubst %, %_install,$(LIB_TARGETS))
@echo " "
@echo "externals install succeeded!"
#==============================================================================#
#
! # OLD EXTERNALS BUILD SYSTEM TARGETS
! #
! # this is all stuff related to the externals/build/src/*.c links
#
#==============================================================================#
! BUILDSRC_OBJECTS := $(wildcard $(externals_src)/build/src/*.c)
!
! buildsrc: $(BUILDSRC_OBJECTS:.c=.$(EXTENSION))
!
!
! buildsrc_install: $(helpdir) $(objectsdir)
! install -p $(BUILDSRC_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)
# all standard objs' help files
# it had to be broken up because the list is soo long
***************
*** 185,188 ****
--- 185,193 ----
+ buildsrc_clean:
+ -rm -f -- $(BUILDSRC_OBJECTS:.c=.$(EXTENSION))
+ -rm -f -- $(externals_src)/build/src/*.*~
+ -rm -f -- $(externals_src)/build/src/*.c.bak
+
#==============================================================================#
***************
*** 883,886 ****
--- 888,892 ----
bash $(externals_src)/unauthorized/tk2c.bash < $*.tk > $*.tk2c
+ # [cooled~] doesn't compile under MinGW (yet)
UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/[a-sw-z]*/*.c)
# [vocoder~] is built separately since its made from a number of files
***************
*** 889,893 ****
$(UNAUTHORIZED_TKFILES:.tk=.tk2c) $(UNAUTHORIZED_OBJECTS:.c=.$(EXTENSION))
$(CC) $(LDFLAGS) -o $(externals_src)/unauthorized/vocoder~/vocoder~.$(EXTENSION) \
! $(UNAUTHORIZED_VOCODER:.c=.o)
unauthorized_install: unauthorized
--- 895,899 ----
$(UNAUTHORIZED_TKFILES:.tk=.tk2c) $(UNAUTHORIZED_OBJECTS:.c=.$(EXTENSION))
$(CC) $(LDFLAGS) -o $(externals_src)/unauthorized/vocoder~/vocoder~.$(EXTENSION) \
! $(UNAUTHORIZED_VOCODER:.c=.o) $(LIBS)
unauthorized_install: unauthorized