From f318ab61cb57b87e902bb9c7db006b7f66877da1 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 23 Nov 2007 23:47:44 +0000 Subject: hack to statically link shared code until I figure out all the shared DLL stuff svn path=/trunk/; revision=9028 --- externals/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'externals') diff --git a/externals/Makefile b/externals/Makefile index f757dfe4..dbf097f4 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -103,6 +103,7 @@ CXXFLAGS = $(CFLAGS) $(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(LIBS) \ `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` chmod a-x "$*.$(EXTENSION)" @@ -2168,9 +2169,9 @@ TKWIDGETS_NAME=tkwidgets TKWIDGETS_OBJECTS := $(wildcard $(externals_src)/tkwidgets/*.c) 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) +# $(CC) $(DYLIB_LDFLAGS) \ +# -o $(externals_src)/tkwidgets/libtkwidgets.$(DYLIB_EXTENSION) \ +# $(TKWIDGETS_SHARED:.c=.o) tkwidgets: tkwidgets_shared $(TKWIDGETS_OBJECTS:.c=.$(EXTENSION)) -- cgit v1.2.1