From d5f3af34344340c718d07c9c84d562785443747e Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Mon, 23 Feb 2004 03:32:54 +0000
Subject:  ""

svn path=/trunk/; revision=1350
---
 externals/grill/xsample/makefile.pd-cygwin | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'externals/grill/xsample/makefile.pd-cygwin')

diff --git a/externals/grill/xsample/makefile.pd-cygwin b/externals/grill/xsample/makefile.pd-cygwin
index 538a9f63..077d4ce4 100644
--- a/externals/grill/xsample/makefile.pd-cygwin
+++ b/externals/grill/xsample/makefile.pd-cygwin
@@ -1,5 +1,5 @@
 # xsample - extended sample objects for Max/MSP and pd (pure data)
-# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 #
 # Makefile for gcc @ cygwin
 #
@@ -9,17 +9,32 @@
 #
 
 CONFIG=config-pd-cygwin.txt
+MAKEFILE=makefile.pd-cygwin
 
 include ${CONFIG}
 
-FLEXTLIB=$(FLEXTPATH)/flext-pdwin.lib
-PDLIBS=$(PD)/bin/pd.dll $(PD)/bin/pthreadVC.dll
 
 # compiler stuff
-INCLUDES=$(PDINC) # /usr/include 
+# /usr/include holds the cygwin pthread headers and must be first!
+INCLUDES=/usr/include $(PDINC) 
+
 FLAGS=-DFLEXT_SYS=2
-CFLAGS=${UFLAGS} -O6 -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions -fno-rtti -fno-exceptions
-LIBS=m
+CFLAGS=-O2 -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions -fno-rtti -fno-exceptions ${UFLAGS} 
+
+PDLIBS=$(PD)/bin/pd.dll $(PD)/bin/pthreadVC.dll
+
+
+ifdef FLEXT_SHARED
+
+CFLAGS+=-DFLEXT_SHARED
+FLEXTLIB=$(FLEXTPATH)/flext.dll
+
+else
+
+FLEXTLIB=$(FLEXTPATH)/flext-pdwin.lib
+
+endif
+
 
 # ----------------------------------------------
 # the rest can stay untouched
@@ -29,7 +44,6 @@ NAME=xsample
 
 include make-files.txt
 
-MAKEFILE=makefile.pd-cygwin
 TARGET=$(TARGDIR)/$(NAME).dll
 
 # default target
@@ -45,7 +59,7 @@ $(TARGDIR)/%.o : $(SRCDIR)/%.cpp
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
 $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) 
-	$(CXX) $(LDFLAGS) -shared $^ ${PDLIBS} $(patsubst %,-l%,$(LIBS)) -o $@ 
+	$(CXX) -shared $(LDFLAGS) $^ ${PDLIBS} $(patsubst %,-l%,$(LIBS)) -o $@ 
 	strip --strip-unneeded $@
 	chmod 755 $@
 
-- 
cgit v1.2.1