From 7e747f8cd9634260c3bbcce628a481d72e5cab3c Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Wed, 12 Nov 2003 03:35:26 +0000
Subject:  ""

svn path=/trunk/; revision=1179
---
 externals/grill/flext/make-inc.pd-msvc | 35 +++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

(limited to 'externals/grill/flext/make-inc.pd-msvc')

diff --git a/externals/grill/flext/make-inc.pd-msvc b/externals/grill/flext/make-inc.pd-msvc
index 3bf75633..4dc5ce50 100644
--- a/externals/grill/flext/make-inc.pd-msvc
+++ b/externals/grill/flext/make-inc.pd-msvc
@@ -10,21 +10,23 @@
 SOURCE=source
 
 # includes
-INCPATH=/I$(MSVCPATH)\include /I$(PDPATH)\src /I$(SOURCE)
-LDFLAGS=/LIBPATH:$(MSVCPATH)\lib
+INCPATH=/I$(PDPATH)\src /I$(SOURCE)
 
-!ifdef SNDOBJ
-INCPATH=$(INCPATH) /I$(SNDOBJ) 
+!ifdef MSVCPATH
+INCPATH=$(INCPATH) /I$(MSVCPATH)\include 
 !endif
 
-!ifdef STK
-INCPATH=$(INCPATH) /I$(STK) 
+!ifdef PTHREADS
+INCPATH=$(INCPATH) /I$(PTHREADS)
 !endif
 
+LDFLAGS=/LIBPATH:$(MSVCPATH)\lib
+
+
 # compiler definitions and flags
 DEFS=/DFLEXT_SYS=2 $(UFLAGS)
 
-CFLAGS=/GX /GD /G6 /arch:SSE
+CFLAGS=/GX /GD
 OFLAGS=/Ox
 DFLAGS=/Od /Zi
 
@@ -33,7 +35,7 @@ TARGET=pdwin  # appendix to lib name
 
 
 !ifdef FLEXT_SHARED
-DEFS=$(DEFS) /DFLEXT_SHARED /DFLEXT_DLL 
+DEFS=$(DEFS) /DFLEXT_SHARED /DFLEXT_EXPORTS 
 
 EXT=dll
 
@@ -45,6 +47,14 @@ CFLAGS=$(CFLAGS) $(DFLAGS) /MTd /LDd
 OBJPATH=ld
 !endif
 
+LIBS=$(PDPATH)\bin\pd.lib 
+
+!ifdef PTHREADS
+LIBS=$(LIBS) $(PTHREADS)\pthreadVC.lib 
+!else
+LIBS=$(LIBS) $(PDPATH)\bin\pthreadVC.lib 
+!endif
+
 !else
 
 EXT=lib
@@ -84,11 +94,15 @@ OBJPATH=sd
 !ifdef SNDOBJ
 SRCS=$(SRCS) $(SRCS_SNDOBJ)
 HDRS=$(HDRS) $(HDRS_SNDOBJ)
+INCPATH=$(INCPATH) /I$(SNDOBJ)\include
+LIBS=$(LIBS) $(SNDOBJ)\lib\sndobj.lib
 !endif
 
 !ifdef STK
 SRCS=$(SRCS) $(SRCS_STK)
 HDRS=$(HDRS) $(HDRS_STK)
+INCPATH=$(INCPATH) /I$(STK)\include
+LIBS=$(LIBS) $(STK)\lib\stk.lib
 !endif
 
 #default target
@@ -112,8 +126,7 @@ OBJS= $(SRCS:.cpp=.obj)
 	@cd $(OUTPATH)
 	@-if not exist $(OBJPATH) mkdir $(OBJPATH)
 	@cd ..
-	cl /c $(CFLAGS) $(DEFS) $(INCPATH) /Fo$(OUTPATH)\$(OBJPATH)\$@ $<
-
+	cl /c $(CFLAGS) $(DEFS) $(INCPATH) /Fo$(OUTPATH)\$(OBJPATH)\$(@F) $<
 
 
 $(OUTPATH)\$(NAME)-$(TARGET).lib: $(OBJS)
@@ -129,7 +142,7 @@ $(OUTPATH)\$(NAME)-$(TARGET).lib: $(OBJS)
 
 $(OUTPATH)\$(NAME)-$(TARGET).dll: $(OBJS)
 	@cd $(OUTPATH)\$(OBJPATH)
-	link /DLL /NOLOGO $(LDFLAGS) /OUT:..\$(NAME)-$(TARGET).dll $(PDPATH)\bin\pd.lib $(OBJS)
+	link /DLL /NOLOGO $(LDFLAGS) /OUT:..\$(NAME)-$(TARGET).dll $(LIBS) $(OBJS)
 	@cd ..\..
 !ifdef INSTDIR
 	@-if not exist $(OBJPATH) mkdir $(INSTDIR)
-- 
cgit v1.2.1