From c454a7b744916a1882c54ecbeca8fa1c09f6444e Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Fri, 17 Dec 2004 05:05:54 +0000 Subject: first version using flext build system name changes for svn repository svn path=/trunk/; revision=2400 --- externals/grill/dynext/build-pd-msvc.bat | 4 -- externals/grill/dynext/build-win-pd-msvc.bat | 4 ++ externals/grill/dynext/config-pd-msvc.txt | 23 ---------- externals/grill/dynext/config-win-pd-msvc.txt | 11 +++++ externals/grill/dynext/dynext.vcproj | 4 +- externals/grill/dynext/make-files.txt | 2 +- externals/grill/dynext/makefile-win-msvc.txt | 10 +++++ externals/grill/dynext/makefile.pd-darwin | 4 +- externals/grill/dynext/makefile.pd-linux | 4 +- externals/grill/dynext/makefile.pd-msvc | 60 --------------------------- 10 files changed, 32 insertions(+), 94 deletions(-) delete mode 100644 externals/grill/dynext/build-pd-msvc.bat create mode 100644 externals/grill/dynext/build-win-pd-msvc.bat delete mode 100644 externals/grill/dynext/config-pd-msvc.txt create mode 100644 externals/grill/dynext/config-win-pd-msvc.txt create mode 100644 externals/grill/dynext/makefile-win-msvc.txt delete mode 100644 externals/grill/dynext/makefile.pd-msvc diff --git a/externals/grill/dynext/build-pd-msvc.bat b/externals/grill/dynext/build-pd-msvc.bat deleted file mode 100644 index d6187f08..00000000 --- a/externals/grill/dynext/build-pd-msvc.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo --- Building with MS Visual C++ --- - -nmake -f makefile.pd-msvc clean -nmake -f makefile.pd-msvc diff --git a/externals/grill/dynext/build-win-pd-msvc.bat b/externals/grill/dynext/build-win-pd-msvc.bat new file mode 100644 index 00000000..942ee174 --- /dev/null +++ b/externals/grill/dynext/build-win-pd-msvc.bat @@ -0,0 +1,4 @@ +@echo --- Building with MS Visual C++ --- + +nmake -f ..\flext\build\make-win-pd-msvc.txt clean +nmake -f ..\flext\build\make-win-pd-msvc.txt diff --git a/externals/grill/dynext/config-pd-msvc.txt b/externals/grill/dynext/config-pd-msvc.txt deleted file mode 100644 index e163ffd3..00000000 --- a/externals/grill/dynext/config-pd-msvc.txt +++ /dev/null @@ -1,23 +0,0 @@ -# dyn~ - dynamic object management for PD -# -# Copyright (c)Thomas Grill (xovo@gmx.net) -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "license.txt," in this distribution. -# - -# where is PD? -PDPATH=c:\programme\audio\pd - -# where do the flext libraries reside? -FLEXTPATH=$(PDPATH)\flext - -# where is MS VC++ installed? -# if the VC++ command prompt is used VCINSTALLDIR should already be set correctly -MSVCDIR=$(VCINSTALLDIR) - -# where should the external be built? -OUTPATH=pd-msvc - -# where should the external be installed? -# (leave blank to omit installation) -INSTPATH=$(PDPATH)\extra diff --git a/externals/grill/dynext/config-win-pd-msvc.txt b/externals/grill/dynext/config-win-pd-msvc.txt new file mode 100644 index 00000000..ac393b7d --- /dev/null +++ b/externals/grill/dynext/config-win-pd-msvc.txt @@ -0,0 +1,11 @@ +# dyn~ - dynamic object management for PD +# +# Copyright (c)Thomas Grill (gr@grrrr.org) +# For information on usage and redistribution, and for a DISCLAIMER OF ALL +# WARRANTIES, see the file, "license.txt," in this distribution. +# +# +# Your settings are defined in the file +# ..\flext\build\config-win-max-msvc.txt +# +# You can override them here. diff --git a/externals/grill/dynext/dynext.vcproj b/externals/grill/dynext/dynext.vcproj index 78a1a91e..7d2121fe 100644 --- a/externals/grill/dynext/dynext.vcproj +++ b/externals/grill/dynext/dynext.vcproj @@ -158,7 +158,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="TRUE" OptimizeForProcessor="3" - AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src,f:\prog\max\flext\source;f:\prog\packs\pthreads" + AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";c:\data\prog\max\flext\source;c:\data\prog\packs\pthreads" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED" StringPooling="TRUE" RuntimeLibrary="2" @@ -176,7 +176,7 @@ OutputFile="$(outdir)/dyn~.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="f:\prog\pd\pd-cvs/bin,..\flext\pd-msvc,f:\prog\packs\pthreads" + AdditionalLibraryDirectories=""c:\data\prog\pd\pd-cvs/bin";"..\flext\pd-msvc";c:\data\prog\packs\pthreads" ProgramDatabaseFile="$(outdir)/dyn~.pdb" ImportLibrary="$(outdir)/dyn~.lib" TargetMachine="1"/> diff --git a/externals/grill/dynext/make-files.txt b/externals/grill/dynext/make-files.txt index 0538f6b7..4295a816 100644 --- a/externals/grill/dynext/make-files.txt +++ b/externals/grill/dynext/make-files.txt @@ -1,7 +1,7 @@ NAME=dyn~ # all the source files from the package -DIR=src +SRCDIR=src SRCS= main.cpp HDRS= diff --git a/externals/grill/dynext/makefile-win-msvc.txt b/externals/grill/dynext/makefile-win-msvc.txt new file mode 100644 index 00000000..06048ae9 --- /dev/null +++ b/externals/grill/dynext/makefile-win-msvc.txt @@ -0,0 +1,10 @@ +# dyn~ - dynamic object management for PD +# +# Copyright (c)Thomas Grill (gr@grrrr.org) +# For information on usage and redistribution, and for a DISCLAIMER OF ALL +# WARRANTIES, see the file, "license.txt," in this distribution. +# +# Makefile for MSVC++ 6 and .NET +# +# usage: +# to build run "build-win-pd-msvc.bat" diff --git a/externals/grill/dynext/makefile.pd-darwin b/externals/grill/dynext/makefile.pd-darwin index f7588e29..d12a685c 100644 --- a/externals/grill/dynext/makefile.pd-darwin +++ b/externals/grill/dynext/makefile.pd-darwin @@ -49,13 +49,13 @@ TARGET=$(TARGDIR)/$(NAME).pd_darwin # default target all: $(TARGDIR) $(TARGET) -$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(CONFIG) +$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(CONFIG) touch $@ $(TARGDIR): mkdir $(TARGDIR) -$(TARGDIR)/%.o : $(DIR)/%.cpp +$(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) diff --git a/externals/grill/dynext/makefile.pd-linux b/externals/grill/dynext/makefile.pd-linux index 9d401053..663fd67a 100644 --- a/externals/grill/dynext/makefile.pd-linux +++ b/externals/grill/dynext/makefile.pd-linux @@ -60,13 +60,13 @@ TARGET=$(TARGDIR)/$(NAME).pd_linux # default target all: $(TARGDIR) $(TARGET) -$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG) +$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG) touch $@ $(TARGDIR): -mkdir $(TARGDIR) -$(TARGDIR)/%.o : $(DIR)/%.cpp +$(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) diff --git a/externals/grill/dynext/makefile.pd-msvc b/externals/grill/dynext/makefile.pd-msvc deleted file mode 100644 index 94561b3e..00000000 --- a/externals/grill/dynext/makefile.pd-msvc +++ /dev/null @@ -1,60 +0,0 @@ -# dyn~ - dynamic object management for PD -# -# Copyright (c)Thomas Grill (xovo@gmx.net) -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "license.txt," in this distribution. -# -# -# Makefile for MSVC++ 7 -# -# usage: -# to build run "make -f makefile.pd-msvc" -# - -!include config-pd-msvc.txt - -# includes -INCPATH=/I"$(MSVCPATH)\include" /I"$(PDPATH)\src" /I"$(FLEXTPATH)" -LIBPATH=/LIBPATH:"$(MSVCPATH)\lib" /LIBPATH:"$(PDPATH)\bin" /LIBPATH:"$(FLEXTPATH)" -LIBS=pd.lib flext-pdwin.lib - -# compiler definitions and flags -DEFS=/DFLEXT_SYS=2 - -CFLAGS=/EHsc /G6 /Ox /ML - -# the rest can stay untouched -# ---------------------------------------------- - -# all the source files from the package -!include make-files.txt - -# ----------------------------------------------- - -NAME=dyn~ - -all: $(OUTPATH) $(OUTPATH)\$(NAME).dll - -# remove build -clean: - -del /q $(OUTPATH) > nul - -rmdir $(OUTPATH) > nul - -OBJS= $(SRCS:.cpp=.obj) - -$(OUTPATH): - -mkdir $(OUTPATH) > nul - -{$(DIR)}.cpp{}.obj: - cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)\$@ - -$(OUTPATH)\$(NAME).dll: $(OBJS) - cd $(OUTPATH) - link /DLL /out:$(NAME).dll /INCREMENTAL:NO $** $(LIBS) $(LIBPATH) - @-del *.exp - @-del *.lib - cd .. -!ifdef INSTPATH - @-if not exist $(INSTPATH) mkdir $(INSTPATH) - copy $@ $(INSTPATH) > nul -!endif -- cgit v1.2.1