[PD-cvs] externals Makefile,1.167,1.168
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Sat Nov 24 00:47:46 CET 2007
Update of /cvsroot/pure-data/externals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17325
Modified Files:
Makefile
Log Message:
hack to statically link shared code until I figure out all the shared DLL stuff
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** Makefile 15 Nov 2007 17:27:02 -0000 1.167
--- Makefile 23 Nov 2007 23:47:44 -0000 1.168
***************
*** 104,107 ****
--- 104,108 ----
`test -f $*.libs && cat $*.libs` \
`my_dylib=$(patsubst $(externals_src)/%,%,$(@D)); test -f $(@D)/lib$${my_dylib}.$(DYLIB_EXTENSION) && echo -L$(@D) -l$$my_dylib` \
+ `my_obj=$(patsubst $(externals_src)/%,%,$(@D)); test -f $(@D)/shared/$${my_obj}.o && echo $(@D)/shared/$${my_obj}.o` \
`test -f $(dir $*)../$(BUILDSRC_OS_NAME)/$(notdir $*).libs && \
cat $(dir $*)../$(BUILDSRC_OS_NAME)/$(notdir $*).libs`
***************
*** 2169,2175 ****
TKWIDGETS_SHARED := $(wildcard $(externals_src)/tkwidgets/shared/*.c)
tkwidgets_shared: $(TKWIDGETS_SHARED:.c=.o)
! $(CC) $(DYLIB_LDFLAGS) \
! -o $(externals_src)/tkwidgets/libtkwidgets.$(DYLIB_EXTENSION) \
! $(TKWIDGETS_SHARED:.c=.o)
tkwidgets: tkwidgets_shared $(TKWIDGETS_OBJECTS:.c=.$(EXTENSION))
--- 2170,2176 ----
TKWIDGETS_SHARED := $(wildcard $(externals_src)/tkwidgets/shared/*.c)
tkwidgets_shared: $(TKWIDGETS_SHARED:.c=.o)
! # $(CC) $(DYLIB_LDFLAGS) \
! # -o $(externals_src)/tkwidgets/libtkwidgets.$(DYLIB_EXTENSION) \
! # $(TKWIDGETS_SHARED:.c=.o)
tkwidgets: tkwidgets_shared $(TKWIDGETS_OBJECTS:.c=.$(EXTENSION))
More information about the Pd-cvs
mailing list