From a159a80adc40739759daee3cfb123736cbe42bab Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 10 Apr 2011 20:52:46 +0000 Subject: committed patches from unauthorized-w32-patches-10-april-2010.zip from patch #3283782 svn path=/trunk/; revision=15069 --- externals/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'externals') diff --git a/externals/Makefile b/externals/Makefile index 3eb7978b..8929f1b2 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -79,7 +79,7 @@ ifeq ($(OS_NAME),windows) # 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)/src -L$(pd_src)/bin -L$(pd_src)/obj -lpd \ - -lwsock32 -liphlpapi -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex + -lwsock32 -liphlpapi -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex -liberty DYLIB_LDFLAGS = -shared STRIP = strip --strip-unneeded -R .note -R .comment endif @@ -1672,7 +1672,7 @@ UNAUTHORIZED_TKFILES = $(wildcard $(externals_src)/unauthorized/*/*.tk) # a number of objects don't compile under MinGW (yet? they used to, but the # needed changes were overwritten, so they are in CVS ifeq ($(OS_NAME),windows) -UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/[abdg-oqrw]*/*.c)\ +UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/[abcdefg-opqrsw]*/*.c)\ $(wildcard $(externals_src)/unauthorized/c?[a-np-z]*/*.c) else ifeq ($(OS_NAME),darwin) -- cgit v1.2.1