From b1d0383c31cc936710fb9099f6d9e86e7eeae569 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Wed, 5 Jan 2005 05:04:55 +0000 Subject: made default configurations generic two more flext tutorials fixes for Max headers cleanups updated build system updated tutorials revised the documentation updated for OSX upgraded version number svn path=/trunk/; revision=2465 --- .../grill/flext/buildsys/win/bmake-bcc-ext.inc | 107 +++++++------- .../grill/flext/buildsys/win/bmake-bcc-flext.inc | 154 ++++++++++----------- externals/grill/flext/buildsys/win/bmake-bcc.inc | 83 +++++------ .../flext/buildsys/win/gnumake-cygwin-ext.inc | 83 +++++------ .../flext/buildsys/win/gnumake-cygwin-flext.inc | 103 +++++++------- .../grill/flext/buildsys/win/gnumake-cygwin.inc | 9 +- .../grill/flext/buildsys/win/gnumake-mingw-ext.inc | 93 +++++++------ .../flext/buildsys/win/gnumake-mingw-flext.inc | 112 +++++++-------- .../grill/flext/buildsys/win/gnumake-mingw.inc | 9 +- .../grill/flext/buildsys/win/max/config-mingw.def | 19 ++- .../grill/flext/buildsys/win/max/config-msvc.def | 17 ++- .../flext/buildsys/win/max/gnumake-mingw-ext.inc | 2 +- .../flext/buildsys/win/max/gnumake-mingw-flext.inc | 12 +- .../flext/buildsys/win/max/nmake-msvc-ext.inc | 2 +- .../flext/buildsys/win/max/nmake-msvc-flext.inc | 10 +- .../grill/flext/buildsys/win/nmake-msvc-ext.inc | 89 ++++++------ .../grill/flext/buildsys/win/nmake-msvc-flext.inc | 131 +++++++++--------- externals/grill/flext/buildsys/win/nmake-msvc.inc | 13 +- .../grill/flext/buildsys/win/pd/bmake-bcc-ext.inc | 2 +- .../flext/buildsys/win/pd/bmake-bcc-flext.inc | 10 +- .../grill/flext/buildsys/win/pd/config-bcc.def | 7 +- .../grill/flext/buildsys/win/pd/config-cygwin.def | 8 +- .../grill/flext/buildsys/win/pd/config-mingw.def | 12 +- .../grill/flext/buildsys/win/pd/config-msvc.def | 10 +- .../flext/buildsys/win/pd/gnumake-cygwin-ext.inc | 2 +- .../flext/buildsys/win/pd/gnumake-cygwin-flext.inc | 10 +- .../grill/flext/buildsys/win/pd/gnumake-cygwin.inc | 2 +- .../flext/buildsys/win/pd/gnumake-mingw-ext.inc | 2 +- .../flext/buildsys/win/pd/gnumake-mingw-flext.inc | 10 +- .../grill/flext/buildsys/win/pd/nmake-msvc-ext.inc | 2 +- .../flext/buildsys/win/pd/nmake-msvc-flext.inc | 10 +- 31 files changed, 574 insertions(+), 561 deletions(-) (limited to 'externals/grill/flext/buildsys/win') diff --git a/externals/grill/flext/buildsys/win/bmake-bcc-ext.inc b/externals/grill/flext/buildsys/win/bmake-bcc-ext.inc index 3a61d1be..ff26dc12 100644 --- a/externals/grill/flext/buildsys/win/bmake-bcc-ext.inc +++ b/externals/grill/flext/buildsys/win/bmake-bcc-ext.inc @@ -1,54 +1,53 @@ -# build class specific settings - -INCPATH=$(INCPATH) -I$(FLEXTINC) -LIBPATH=$(LIBPATH) -L$(FLEXTLIB) -LIBS=$(LIBS) $(FLEXTNAME).lib - -############################################## - -# default target -_build_: $(TARGET) - -$(OUTPATH): - if not exist $@ mkdir $@ > nul - -$(TARGETPATH): $(OUTPATH) - if not exist $@ mkdir $@ > nul - -SETUPFUNCTION=$(NAME)_setup - -$(TARGETPATH)\$(NAME).def: $(TARGETPATH) - @echo EXPORTS $(SETUPFUNCTION) = _$(SETUPFUNCTION) > $@ -# this next line fixes a strange problem with implib - lacking underscore?! - @echo IMPORTS _rtext_retext=PD.rtext_retext >> $@ - -$(TARGET) :: $(TARGETPATH)\$(NAME).def - -{$(SRCDIR)}.cpp{}.obj: - bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< - -{$(SRCDIR)}.c{}.obj: - bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< - -$(TARGET) :: $(TARGETPATH) - -$(TARGET) :: $(OBJS) - @cd $(TARGETPATH) - ilink32 $(LDFLAGS) $(LIBPATH) -L. $(OBJS) ,$( nul - -cd $(TARGETPATH) - -del /q $(OBJS) > nul - -############################################## - -$(INSTPATH): - if not exist $@ mkdir $@ > nul - -_install_: $(INSTPATH) - copy $(TARGET) $(INSTPATH) > nul +# build class specific settings + +INCPATH=$(INCPATH) -I$(FLEXTINC) +LIBPATH=$(LIBPATH) -L$(FLEXTLIB) +LIBS=$(LIBS) $(FLEXTNAME).lib + +############################################## + +# default target +_build_: $(TARGET) + +$(OUTPATH): + if not exist $@ mkdir $@ > nul + +$(TARGETPATH): $(OUTPATH) + if not exist $@ mkdir $@ > nul + +SETUPFUNCTION=$(NAME)_setup + +$(TARGETPATH)\$(NAME).def: $(TARGETPATH) + @echo EXPORTS $(SETUPFUNCTION) = _$(SETUPFUNCTION) > $@ +# this next line fixes a strange problem with implib - lacking underscore?! + @echo IMPORTS _rtext_retext=PD.rtext_retext >> $@ + +$(TARGET) :: $(TARGETPATH)\$(NAME).def + +{$(SRCDIR)}.cpp{}.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< + +{$(SRCDIR)}.c{}.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(OBJS) + @cd $(TARGETPATH) + ilink32 $(LDFLAGS) $(LIBPATH) -L. $(OBJS) ,$( nul + -rmdir /q $(TARGETPATH) > nul + +############################################## + +$(INSTPATH): + if not exist $@ mkdir $@ > nul + +_install_: $(INSTPATH) + copy $(TARGET) $(INSTPATH) > nul diff --git a/externals/grill/flext/buildsys/win/bmake-bcc-flext.inc b/externals/grill/flext/buildsys/win/bmake-bcc-flext.inc index a0486cf6..8dfb224e 100644 --- a/externals/grill/flext/buildsys/win/bmake-bcc-flext.inc +++ b/externals/grill/flext/buildsys/win/bmake-bcc-flext.inc @@ -1,84 +1,70 @@ -# build class specific settings - -############################################## - -# default target -_build_: $(TARGET) - -$(OUTPATH): - if not exist $@ mkdir $@ > nul - -$(TARGETPATH): $(OUTPATH) - if not exist $@ mkdir $@ > nul - -{$(SRCDIR)}.cpp{}.obj: - bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< - -{$(SRCDIR)}.c{}.obj: - bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< - - -$(TARGETPATH)\pd.lib : $(PDPATH)\bin\pd.dll - implib -a $< $** - -$(TARGETPATH)\pthreadVC.lib : $(PDPATH)\bin\pthreadVC.dll - implib -a $< $** - -PDTARGETS=$(TARGETPATH)\pd.lib $(TARGETPATH)\pthreadVC.lib - - -$(TARGET) :: $(TARGETPATH) $(PDTARGETS) - -$(TARGET) :: $(OBJS) - @cd $(TARGETPATH) -!ifdef SHARED - ilink32 $(LDFLAGS) $(LIBPATH) -L. $(OBJS) ,$( nul - -cd $(TARGETPATH) - -del /q $(OBJS) > nul - -############################################## - -!ifdef SHARED -FLEXTLIBINST=$(FLEXTSHLIB) -!else -FLEXTLIBINST=$(FLEXTLIB) -!endif - -$(FLEXTINC): - if not exist $@ mkdir $@ > nul - -!if "$(FLEXTINC)" != "$(FLEXTLIB)" -$(FLEXTLIB): - if not exist $@ mkdir $@ > nul - -_install_:: $(FLEXTLIB) -!endif - -!if "$(FLEXTLIBINST)" != "$(FLEXTLIB)" && "$(FLEXTLIBINST)" != "$(FLEXTINC)" -$(FLEXTLIBINST): - if not exist $@ mkdir $@ > nul - -_install_:: $(FLEXTLIBINST) -!endif - -_install_:: $(FLEXTINC) - copy $(TARGET) $(FLEXTLIBINST) > nul -!ifdef SHARED -# copy import library - copy $(TARGET:.dll=.lib) $(FLEXTLIB) > nul -!endif -# copy headers - for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(FLEXTINC) > nul -# copy import libraries - for %%i in ($(PDTARGETS)) do @copy %%i $(FLEXTLIBINST) > nul +# build class specific settings + +############################################## + +# default target +_build_: $(TARGET) + +$(OUTPATH): + if not exist $@ mkdir $@ > nul + +$(TARGETPATH): $(OUTPATH) + if not exist $@ mkdir $@ > nul + +{$(SRCDIR)}.cpp{}.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< + +{$(SRCDIR)}.c{}.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< + + +$(TARGETPATH)\pd.lib : $(PDPATH)\bin\pd.dll + implib -a $< $** + +$(TARGETPATH)\pthreadVC.lib : $(PDPATH)\bin\pthreadVC.dll + implib -a $< $** + +PDTARGETS=$(TARGETPATH)\pd.lib $(TARGETPATH)\pthreadVC.lib + + +$(TARGET) :: $(TARGETPATH) $(PDTARGETS) + +$(TARGET) :: $(OBJS) + @cd $(TARGETPATH) +!ifdef SHARED + ilink32 $(LDFLAGS) $(LIBPATH) -L. $(OBJS) ,$( nul + -rmdir /q $(TARGETPATH) > nul + +############################################## + +!ifdef SHARED +FLEXTLIBINST=$(FLEXTSHLIB) +!else +FLEXTLIBINST=$(FLEXTLIB) +!endif + +_install_: + @if not exist $@ mkdir $(FLEXTINC) > nul + @if not exist $@ mkdir $(FLEXTLIB) > nul + @if not exist $@ mkdir $(FLEXTLIBINST) > nul + + copy $(TARGET) $(FLEXTLIBINST) > nul +!ifdef SHARED +# copy import library + copy $(TARGET:.dll=.lib) $(FLEXTLIB) > nul +!endif +# copy headers + for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(FLEXTINC) > nul +# copy import libraries + for %%i in ($(PDTARGETS)) do @copy %%i $(FLEXTLIB) > nul diff --git a/externals/grill/flext/buildsys/win/bmake-bcc.inc b/externals/grill/flext/buildsys/win/bmake-bcc.inc index dc9d6ae1..e852ea9a 100644 --- a/externals/grill/flext/buildsys/win/bmake-bcc.inc +++ b/externals/grill/flext/buildsys/win/bmake-bcc.inc @@ -1,41 +1,42 @@ -!ifdef BCCPATH -INCPATH=$(INCPATH) -I$(BCCPATH)\include -LIBPATH=$(LIBPATH) -L$(BCCPATH)\lib -!endif - -############################################## - -TARGETPATH=$(OUTPATH)\$(OUTSUB) -TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT) - -############################################## -# use precompiled headers - -!ifndef PRECOMPILE -CFLAGS=$(CFLAGS) -Hh=flext.h -!else -CFLAGS=$(CFLAGS) -Hh=$(PRECOMPILE) -!endif -# location of precompiled file -CFLAGS=$(CFLAGS) -H=$(TARGETPATH)\precompiled.pch - -############################################## - -LIBS=$(LIBS) cw32.lib import32.lib C0D32.OBJ -CFLAGS=$(CFLAGS) -tWD -tWM -w-8004 -w-8027 -w-8057 -LDFLAGS=$(LDFLAGS) /C /Tpd - -############################################## - -!ifdef DEBUG -CFLAGS=$(CFLAGS) -v -D_DEBUG -LDFLAGS=$(LDFLAGS) /v -!else -CFLAGS=$(CFLAGS) $(OFLAGS) -DNDEBUG -!endif - -############################################## -# convert both *.c and *.cpp - -OBJSTMP= $(SRCS:.c=.obj) -OBJS= $(OBJSTMP:.objpp=.obj) +!ifdef BCCPATH +INCPATH=$(INCPATH) -I$(BCCPATH)\include +LIBPATH=$(LIBPATH) -L$(BCCPATH)\lib +!endif + +############################################## + +OBJPATH=$(OUTPATH)\$(OUTSUB) +TARGETPATH=$(OBJPATH) +TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT) + +############################################## +# use precompiled headers + +!ifndef PRECOMPILE +CFLAGS=$(CFLAGS) -Hh=flext.h +!else +CFLAGS=$(CFLAGS) -Hh=$(PRECOMPILE) +!endif +# location of precompiled file +CFLAGS=$(CFLAGS) -H=$(OBJPATH)\precompiled.pch + +############################################## + +LIBS=$(LIBS) cw32.lib import32.lib C0D32.OBJ +CFLAGS=$(CFLAGS) -tWD -tWM -w-8004 -w-8027 -w-8057 +LDFLAGS=$(LDFLAGS) /C /Tpd + +############################################## + +!ifdef DEBUG +CFLAGS=$(CFLAGS) -v -D_DEBUG +LDFLAGS=$(LDFLAGS) /v +!else +CFLAGS=$(CFLAGS) $(OFLAGS) -DNDEBUG +!endif + +############################################## +# convert both *.c and *.cpp + +OBJSTMP= $(SRCS:.c=.obj) +OBJS= $(OBJSTMP:.objpp=.obj) diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc index 95b3125d..91eff1ed 100644 --- a/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc +++ b/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc @@ -1,41 +1,42 @@ -# build class specific settings - -INCPATH += -I$(FLEXTINC) -LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB) -LIBS += -l$(FLEXTNAME) - -############################################## - -# default target -_build_: $(TARGET) - -$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) - touch $@ - -$(TARGETPATH): - -mkdir -p $@ - -$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp - $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ - -$(TARGETPATH)/%.o : $(SRCDIR)/%.c - $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ - -$(TARGET) :: $(TARGETPATH) - -$(TARGET) :: $(COBJS) $(CPPOBJS) - $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) - chmod 755 $@ - -############################################## - -_clean_: - rm $(COBJS) $(CPPOBJS) $(TARGET) - -############################################## - -$(INSTPATH): - -mkdir -p $@ - -_install_: $(INSTPATH) - install $(TARGET) $(INSTPATH) +# build class specific settings + +INCPATH += -I$(FLEXTINC) +LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB) +LIBS += -l$(FLEXTNAME) + +############################################## + +# default target +_build_: $(TARGET) + +$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) + touch $@ + +$(TARGETPATH): + -mkdir -p $@ + +$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGETPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(COBJS) $(CPPOBJS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + strip --strip-unneeded $@ + chmod 755 $@ + +############################################## + +_clean_: + rm $(COBJS) $(CPPOBJS) $(TARGET) + +############################################## + +$(INSTPATH): + -mkdir -p $@ + +_install_: $(INSTPATH) + install $(TARGET) $(INSTPATH) diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc index 9b22d67c..ec55d6b8 100644 --- a/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc +++ b/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc @@ -1,51 +1,52 @@ -# build class specific settings - -############################################## - -# default target -_build_: $(TARGET) - -$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) - touch $@ - -$(TARGETPATH): - -mkdir -p $@ - -$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp - $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ - -$(TARGETPATH)/%.o : $(SRCDIR)/%.c - $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ - -$(TARGET) :: $(TARGETPATH) - -$(TARGET) :: $(COBJS) $(CPPOBJS) -ifdef SHARED - $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) - chmod 755 $@ -else - $(AR) rc $@ $(COBJS) $(CPPOBJS) -endif - -############################################## - -_clean_: - rm $(COBJS) $(CPPOBJS) $(TARGET) - -############################################## - -ifdef SHARED -FLEXTLIBINST=$(FLEXTSHLIB) -else -FLEXTLIBINST=$(FLEXTLIB) -endif - -$(FLEXTINC): - -mkdir -p $@ - -$(FLEXTLIBINST): - -mkdir -p $@ - -_install_: $(FLEXTINC) $(FLEXTLIBINST) - install $(TARGET) $(FLEXTLIBINST) - install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) +# build class specific settings + +############################################## + +# default target +_build_: $(TARGET) + +$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) + touch $@ + +$(TARGETPATH): + -mkdir -p $@ + +$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGETPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(COBJS) $(CPPOBJS) +ifdef SHARED + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + chmod 755 $@ + strip --strip-unneeded $@ +else + $(AR) rc $@ $(COBJS) $(CPPOBJS) +endif + +############################################## + +_clean_: + rm $(COBJS) $(CPPOBJS) $(TARGET) + +############################################## + +ifdef SHARED +FLEXTLIBINST=$(FLEXTSHLIB) +else +FLEXTLIBINST=$(FLEXTLIB) +endif + +$(FLEXTINC): + -mkdir -p $@ + +$(FLEXTLIBINST): + -mkdir -p $@ + +_install_: $(FLEXTINC) $(FLEXTLIBINST) + install $(TARGET) $(FLEXTLIBINST) + install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin.inc index 73425e5d..55022c36 100644 --- a/externals/grill/flext/buildsys/win/gnumake-cygwin.inc +++ b/externals/grill/flext/buildsys/win/gnumake-cygwin.inc @@ -1,11 +1,12 @@ ############################################## -TARGETPATH=$(OUTPATH)/$(OUTSUB) +OBJPATH=$(OUTPATH)/$(OUTSUB) +TARGETPATH=$(OBJPATH) TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT) ############################################## -LDFLAGS += -shared -Wl,-x +LDFLAGS += -shared ############################################## @@ -20,5 +21,5 @@ endif CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) -COBJS=$(patsubst %.c,$(TARGETPATH)/%.o,$(filter %.c,$(SRCS))) -CPPOBJS=$(patsubst %.cpp,$(TARGETPATH)/%.opp,$(filter %.cpp,$(SRCS))) +COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) +CPPOBJS=$(patsubst %.cpp,$(OBJPATH)/%.opp,$(filter %.cpp,$(SRCS))) diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc b/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc index 6932ae5c..f8eea4ac 100644 --- a/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc +++ b/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc @@ -1,43 +1,50 @@ -# build class specific settings - -INCPATH += -I$(FLEXTINC) -LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB) -LIBS += -l$(FLEXTNAME) - -############################################## - -# default target -_build_: $(TARGET) - -#$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) -# touch $@ - -$(OUTPATH): - -mkdir $(subst /,\,$@) - -$(TARGETPATH): $(OUTPATH) - -mkdir $(subst /,\,$@) - -$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp - $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ - -$(TARGETPATH)/%.o : $(SRCDIR)/%.c - $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ - -$(TARGET) :: $(TARGETPATH) - -$(TARGET) :: $(COBJS) $(CPPOBJS) - $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) - -############################################## - -_clean_: - -del $(subst /,\,$(COBJS) $(CPPOBJS) $(TARGET)) - -############################################## - -$(INSTPATH): - -mkdir $(subst /,\,$@) - -_install_: $(INSTPATH) - copy $(subst /,\,$(TARGET) $(INSTPATH)) +# build class specific settings + +INCPATH += -I$(FLEXTINC) +LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB) + +ifdef SHARED +LIBS += $(FLEXTSHLIB)/lib$(FLEXTNAME).dll +else +LIBS += -l$(FLEXTNAME) +endif + +############################################## + +# default target +_build_: $(TARGET) + +#$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) +# touch $@ + +$(OUTPATH): + -cmd /c "mkdir $(subst /,\,$@)" + +$(TARGETPATH): $(OUTPATH) + -cmd /c "mkdir $(subst /,\,$@)" + +$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGETPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(COBJS) $(CPPOBJS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + -strip --strip-unneeded $@ + +############################################## + +_clean_: + -cmd /c "del /q $(subst /,\,$(TARGETPATH)/*.*)" > nul + -cmd /c "rmdir /q $(subst /,\,$(TARGETPATH))" > nul + +############################################## + +$(INSTPATH): + -cmd /c "mkdir $(subst /,\,$@)" + +_install_: $(INSTPATH) + cmd /c "copy $(subst /,\,$(TARGET) $(INSTPATH))" diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc b/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc index 22a6bdfc..69b8afac 100644 --- a/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc +++ b/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc @@ -1,55 +1,57 @@ -# build class specific settings - -############################################## - -# default target -_build_: $(TARGET) - -#$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) -# touch $@ - -$(OUTPATH): - -mkdir $(subst /,\,$@) - -$(TARGETPATH): $(OUTPATH) - -mkdir $(subst /,\,$@) - -$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp - $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ - -$(TARGETPATH)/%.o : $(SRCDIR)/%.c - $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ - -$(TARGET) :: $(TARGETPATH) - -$(TARGET) :: $(COBJS) $(CPPOBJS) -ifdef SHARED - $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) -else - $(AR) rc $@ $(COBJS) $(CPPOBJS) -endif - -############################################## - -_clean_: - -del $(subst /,\,$(COBJS) $(CPPOBJS) $(TARGET)) - -############################################## - -ifdef SHARED -FLEXTLIBINST=$(FLEXTSHLIB) -else -FLEXTLIBINST=$(FLEXTLIB) -endif - -$(FLEXTINC): - -mkdir $(subst /,\,$@) - -$(FLEXTLIBINST): - -mkdir $(subst /,\,$@) - -_install_:: $(FLEXTINC) $(FLEXTLIBINST) - -_install_:: - copy $(subst /,\,$(TARGET) $(FLEXTLIBINST)) - -for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(subst /,\,$(FLEXTPATH)) > nul +# build class specific settings + +############################################## + +# default target +_build_: $(TARGET) + +#$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) +# touch $@ + +$(OUTPATH): + -cmd /c "mkdir $(subst /,\,$@)" + +$(TARGETPATH): $(OUTPATH) + -cmd /c "mkdir $(subst /,\,$@)" + +$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGETPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(COBJS) $(CPPOBJS) +ifdef SHARED + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + -strip --strip-unneeded $@ +else + $(AR) rc $@ $(COBJS) $(CPPOBJS) +endif + +############################################## + +_clean_: + -cmd /c "del /q $(subst /,\,$(TARGETPATH)/*.*)" > nul + -cmd /c "rmdir /q $(subst /,\,$(TARGETPATH))" > nul + +############################################## + +ifdef SHARED +FLEXTLIBINST=$(FLEXTSHLIB) +else +FLEXTLIBINST=$(FLEXTLIB) +endif + +$(FLEXTINC): + -cmd /c "mkdir $(subst /,\,$@)" + +$(FLEXTLIBINST): + -cmd /c "mkdir $(subst /,\,$@)" + +_install_:: $(FLEXTINC) $(FLEXTLIBINST) + +_install_:: + cmd /c "copy $(subst /,\,$(TARGET) $(FLEXTLIBINST))" + -cmd /c "for %i in ($(HDRS)) do @cmd /c copy $(SRCDIR)\%i $(subst /,\,$(FLEXTPATH))" > nul diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw.inc b/externals/grill/flext/buildsys/win/gnumake-mingw.inc index 7a8aab9c..d32f93e6 100644 --- a/externals/grill/flext/buildsys/win/gnumake-mingw.inc +++ b/externals/grill/flext/buildsys/win/gnumake-mingw.inc @@ -1,11 +1,12 @@ ############################################## -TARGETPATH=$(OUTPATH)\$(OUTSUB) +OBJPATH=$(OUTPATH)\$(OUTSUB) +TARGETPATH=$(OBJPATH) TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT) ############################################## -LDFLAGS += -shared -Wl,-x +LDFLAGS += -shared ############################################## @@ -20,5 +21,5 @@ endif CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) -COBJS=$(patsubst %.c,$(TARGETPATH)/%.o,$(filter %.c,$(SRCS))) -CPPOBJS=$(patsubst %.cpp,$(TARGETPATH)/%.opp,$(filter %.cpp,$(SRCS))) +COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) +CPPOBJS=$(patsubst %.cpp,$(OBJPATH)/%.opp,$(filter %.cpp,$(SRCS))) diff --git a/externals/grill/flext/buildsys/win/max/config-mingw.def b/externals/grill/flext/buildsys/win/max/config-mingw.def index d0ce64fa..2727fce6 100644 --- a/externals/grill/flext/buildsys/win/max/config-mingw.def +++ b/externals/grill/flext/buildsys/win/max/config-mingw.def @@ -1,10 +1,6 @@ # where are the Max/MSP SDK header files? # you should have the latest version! -MAXSDKPATH="c:/data/prog/audio/maxmspsdk_win/4.5 headers/c74support" - -# where is MS VC++? -# (not necessary if the build is run with the compiler environment) -# MSVCPATH=C:/Programme/Microsoft Visual Studio .NET 2003/Vc7 +MAXSDKPATH="%ProgramFiles%\MaxMSP 4.5/maxmspsdk_win/4.5 headers/c74support" ############################################################### @@ -15,7 +11,8 @@ FLEXTINC="%CommonProgramFiles%/Cycling '74/flext" FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +# (a good place is the MaxMSP program folder) +FLEXTSHLIB="%ProgramFiles%\MaxMSP 4.5" ############################################################### @@ -26,8 +23,16 @@ OUTPATH=max-mingw # where should the external be installed? INSTPATH="%CommonProgramFiles%/Cycling '74/externals/flext" +# where should the initialization files be installed? +INITPATH="%CommonProgramFiles%/Cycling '74/init" + +# where should the help files be installed? +HELPPATH="%ProgramFiles%/MaxMSP 4.5/max-help/flext" + ############################################################### # some user-definable flags # (check if they match your system!) -OFLAGS=-O2 -march=pentium4 -msse +OFLAGS=-O2 +# optimizations for Pentium 4 +#OFLAGS += -march=pentium4 -msse diff --git a/externals/grill/flext/buildsys/win/max/config-msvc.def b/externals/grill/flext/buildsys/win/max/config-msvc.def index 1c849d32..f67b6b7f 100644 --- a/externals/grill/flext/buildsys/win/max/config-msvc.def +++ b/externals/grill/flext/buildsys/win/max/config-msvc.def @@ -1,10 +1,10 @@ # where are the Max/MSP SDK header files? # you should have the latest version! -MAXSDKPATH="c:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support" +MAXSDKPATH="%ProgramFiles%\MaxMSP 4.5\maxmspsdk_win\4.5 headers\c74support" # where is MS VC++? # (not necessary if the build is run with the compiler environment) -# MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 +# MSVCPATH="%ProgramFiles%\Microsoft Visual Studio .NET 2003\Vc7" ############################################################### @@ -15,7 +15,8 @@ FLEXTINC="%CommonProgramFiles%\Cycling '74\flext" FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +# (a good place is the MaxMSP program folder) +FLEXTSHLIB="%ProgramFiles%\MaxMSP 4.5" ############################################################### @@ -26,11 +27,19 @@ OUTPATH=max-msvc # where should the external be installed? INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext" +# where should the initialization files be installed? +INITPATH="%CommonProgramFiles%\Cycling '74\init" + +# where should the help files be installed? +HELPPATH="%ProgramFiles%\MaxMSP 4.5\max-help\flext" + ############################################################### # some user-definable flags # (check if they match your system!) -OFLAGS=/G6 /Ox /arch:SSE +OFLAGS=/Ox +# optimizations for Pentium 4 +#OFLAGS=$(OFLAGS) /G6 /arch:SSE # uncomment to link against dynamic C runtime libraries # (don't use this if you want to distribute the built product) diff --git a/externals/grill/flext/buildsys/win/max/gnumake-mingw-ext.inc b/externals/grill/flext/buildsys/win/max/gnumake-mingw-ext.inc index 5df7e2f2..04e59462 100644 --- a/externals/grill/flext/buildsys/win/max/gnumake-mingw-ext.inc +++ b/externals/grill/flext/buildsys/win/max/gnumake-mingw-ext.inc @@ -1 +1 @@ -EXT=mxe +EXT=mxe diff --git a/externals/grill/flext/buildsys/win/max/gnumake-mingw-flext.inc b/externals/grill/flext/buildsys/win/max/gnumake-mingw-flext.inc index da986e52..821d6fbc 100644 --- a/externals/grill/flext/buildsys/win/max/gnumake-mingw-flext.inc +++ b/externals/grill/flext/buildsys/win/max/gnumake-mingw-flext.inc @@ -1,6 +1,6 @@ -ifdef SHARED -EXT=dll -else -EXT=LIB -endif - +ifdef SHARED +EXT=dll +else +EXT=LIB +endif + diff --git a/externals/grill/flext/buildsys/win/max/nmake-msvc-ext.inc b/externals/grill/flext/buildsys/win/max/nmake-msvc-ext.inc index 5df7e2f2..04e59462 100644 --- a/externals/grill/flext/buildsys/win/max/nmake-msvc-ext.inc +++ b/externals/grill/flext/buildsys/win/max/nmake-msvc-ext.inc @@ -1 +1 @@ -EXT=mxe +EXT=mxe diff --git a/externals/grill/flext/buildsys/win/max/nmake-msvc-flext.inc b/externals/grill/flext/buildsys/win/max/nmake-msvc-flext.inc index a080ae72..d30a7144 100644 --- a/externals/grill/flext/buildsys/win/max/nmake-msvc-flext.inc +++ b/externals/grill/flext/buildsys/win/max/nmake-msvc-flext.inc @@ -1,5 +1,5 @@ -!ifdef SHARED -EXT=dll -!else -EXT=lib -!endif +!ifdef SHARED +EXT=dll +!else +EXT=lib +!endif diff --git a/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc b/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc index 252d5d2f..419c3276 100644 --- a/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc +++ b/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc @@ -1,45 +1,44 @@ -# build class specific settings - -INCPATH=$(INCPATH) /I$(FLEXTINC) -LIBPATH=$(LIBPATH) /LIBPATH:$(FLEXTLIB) -LIBS=$(LIBS) $(FLEXTNAME).lib - -############################################## - -# default target -_build_: $(TARGET) - -$(OUTPATH): - if not exist $@ mkdir $@ > nul - -$(TARGETPATH): $(OUTPATH) - if not exist $@ mkdir $@ > nul - -{$(SRCDIR)}.cpp{}.obj: - cl /c $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ - -{$(SRCDIR)}.c{}.obj: - cl /c $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ - -$(TARGET):: $(TARGETPATH) - -$(TARGET):: $(OBJS) - @cd $(TARGETPATH) - link /DLL $(LDFLAGS) $(LIBPATH) $(OBJS) $(LIBS) /out:$(@F) - @cd ..\.. - -############################################## -# remove build - -_clean_: - -del /q $(TARGET) > nul - -cd $(TARGETPATH) - -del /q $(OBJS) > nul - -############################################## - -$(INSTPATH): - if not exist $@ mkdir $@ > nul - -_install_: $(INSTPATH) - copy $(TARGET) $(INSTPATH) > nul +# build class specific settings + +INCPATH=$(INCPATH) /I$(FLEXTINC) +LIBPATH=$(LIBPATH) /LIBPATH:$(FLEXTLIB) +LIBS=$(LIBS) $(FLEXTNAME).lib + +############################################## + +# default target +_build_: $(TARGET) + +$(OUTPATH): + if not exist $@ mkdir $@ > nul + +$(TARGETPATH): $(OUTPATH) + if not exist $@ mkdir $@ > nul + +{$(SRCDIR)}.cpp{}.obj: + cl /c $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ + +{$(SRCDIR)}.c{}.obj: + cl /c $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ + +$(TARGET):: $(TARGETPATH) + +$(TARGET):: $(OBJS) + @cd $(TARGETPATH) + link /DLL $(LDFLAGS) $(LIBPATH) $(OBJS) $(LIBS) /out:$(@F) + @cd ..\.. + +############################################## +# remove build + +_clean_: + -del /q $(TARGETPATH)\*.* > nul + -rmdir /q $(TARGETPATH) > nul + +############################################## + +$(INSTPATH): + if not exist $@ mkdir $@ > nul + +_install_: $(INSTPATH) + copy $(TARGET) $(INSTPATH) > nul diff --git a/externals/grill/flext/buildsys/win/nmake-msvc-flext.inc b/externals/grill/flext/buildsys/win/nmake-msvc-flext.inc index 6c64d682..389533de 100644 --- a/externals/grill/flext/buildsys/win/nmake-msvc-flext.inc +++ b/externals/grill/flext/buildsys/win/nmake-msvc-flext.inc @@ -1,66 +1,65 @@ -# build class specific settings - -############################################## - -# default target -_build_: $(TARGET) - -$(OUTPATH): - if not exist $@ mkdir $@ > nul - -$(TARGETPATH): $(OUTPATH) - if not exist $@ mkdir $@ > nul - -{$(SRCDIR)}.cpp{}.obj: - cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ - -{$(SRCDIR)}.c{}.obj: - cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ - - -$(TARGET):: $(TARGETPATH) - -$(TARGET):: $(OBJS) - @cd $(TARGETPATH) -!ifdef SHARED - link /DLL $(LDFLAGS) $(LIBPATH) $(OBJS) $(LIBS) /out:$(@F) -!else - lib /OUT:$(@F) $(OBJS) -!endif - @cd ..\.. - -############################################## - -# remove build -_clean_: - -del /q $(TARGET) > nul - -cd $(TARGETPATH) - -del /q $(OBJS) > nul - -############################################## - -!ifdef SHARED -FLEXTLIBINST=$(FLEXTSHLIB) -!else -FLEXTLIBINST=$(FLEXTLIB) -!endif - -$(FLEXTINC): - if not exist $@ mkdir $@ > nul - -$(FLEXTLIB): - if not exist $@ mkdir $@ > nul - -$(FLEXTLIBINST): - if not exist $@ mkdir $@ > nul - -_install_:: $(FLEXTINC) $(FLEXTLIB) $(FLEXTLIBINST) - -_install_:: - copy $(TARGET) $(FLEXTLIBINST) > nul -!ifdef SHARED -# copy import library - copy $(TARGET:.dll=.lib) $(FLEXTLIB) > nul -!endif -# copy headers - for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(FLEXTINC) > nul +# build class specific settings + +############################################## + +# default target +_build_: $(TARGET) + +$(OUTPATH): + if not exist $@ mkdir $@ > nul + +$(TARGETPATH): $(OUTPATH) + if not exist $@ mkdir $@ > nul + +{$(SRCDIR)}.cpp{}.obj: + cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ + +{$(SRCDIR)}.c{}.obj: + cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ + + +$(TARGET):: $(TARGETPATH) + +$(TARGET):: $(OBJS) + @cd $(TARGETPATH) +!ifdef SHARED + link /DLL $(LDFLAGS) $(LIBPATH) $(OBJS) $(LIBS) /out:$(@F) +!else + lib /OUT:$(@F) $(OBJS) +!endif + @cd ..\.. + +############################################## + +# remove build +_clean_: + -del /q $(TARGETPATH)\*.* > nul + -rmdir /q $(TARGETPATH) > nul + +############################################## + +!ifdef SHARED +FLEXTLIBINST=$(FLEXTSHLIB) +!else +FLEXTLIBINST=$(FLEXTLIB) +!endif + +$(FLEXTINC): + if not exist $@ mkdir $@ > nul + +$(FLEXTLIB): + if not exist $@ mkdir $@ > nul + +$(FLEXTLIBINST): + if not exist $@ mkdir $@ > nul + +_install_:: $(FLEXTINC) $(FLEXTLIB) $(FLEXTLIBINST) + +_install_:: + copy $(TARGET) $(FLEXTLIBINST) > nul +!ifdef SHARED +# copy import library + copy $(TARGET:.dll=.lib) $(FLEXTLIB) > nul +!endif +# copy headers + for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(FLEXTINC) > nul diff --git a/externals/grill/flext/buildsys/win/nmake-msvc.inc b/externals/grill/flext/buildsys/win/nmake-msvc.inc index fb74a7bf..b8a51425 100644 --- a/externals/grill/flext/buildsys/win/nmake-msvc.inc +++ b/externals/grill/flext/buildsys/win/nmake-msvc.inc @@ -5,24 +5,21 @@ LIBPATH=$(LIBPATH) /LIBPATH:$(MSVCPATH)\lib ############################################## -TARGETPATH=$(OUTPATH)\$(OUTSUB) +OBJPATH=$(OUTPATH)\$(OUTSUB) +TARGETPATH=$(OBJPATH) TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT) ############################################## # use precompiled headers (automatic mode) -!ifndef PRECOMPILE -CFLAGS=$(CFLAGS) /YXflext.h -!else -CFLAGS=$(CFLAGS) /YX$(PRECOMPILE) +!ifdef PRECOMPILE +CFLAGS=$(CFLAGS) /YX$(PRECOMPILE) /Fp$(OBJPATH)\precompiled.pch !endif -# location of precompiled file -CFLAGS=$(CFLAGS) /Fp$(TARGETPATH)\precompiled.pch ############################################## # create code for DLL -CFLAGS=$(CFLAGS) /LD /GD +CFLAGS=$(CFLAGS) /LD # enable exception handling CFLAGS=$(CFLAGS) /GX diff --git a/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc b/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc index b2234c5b..26bcf06e 100644 --- a/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc +++ b/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc @@ -1 +1 @@ -EXT=dll +EXT=dll diff --git a/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc b/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc index a080ae72..d30a7144 100644 --- a/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc +++ b/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc @@ -1,5 +1,5 @@ -!ifdef SHARED -EXT=dll -!else -EXT=lib -!endif +!ifdef SHARED +EXT=dll +!else +EXT=lib +!endif diff --git a/externals/grill/flext/buildsys/win/pd/config-bcc.def b/externals/grill/flext/buildsys/win/pd/config-bcc.def index 285e5b02..e473c6a7 100644 --- a/externals/grill/flext/buildsys/win/pd/config-bcc.def +++ b/externals/grill/flext/buildsys/win/pd/config-bcc.def @@ -1,8 +1,8 @@ # where is PD? -PDPATH=c:\programme\audio\pd +PDPATH="c:\program files\pd" # where is BorlandC++? -BCCPATH=C:\Programme\prog\bcc55 +BCCPATH="c:\program files\bcc55" ############################################################### @@ -13,7 +13,7 @@ FLEXTINC=$(PDPATH)\flext FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +FLEXTSHLIB=$(PDPATH)\bin ############################################################### @@ -28,4 +28,3 @@ INSTPATH=$(PDPATH)\extra # user defined compiler flags # (check if they match your system!) OFLAGS=-6 -O2 -OS -ff -d - diff --git a/externals/grill/flext/buildsys/win/pd/config-cygwin.def b/externals/grill/flext/buildsys/win/pd/config-cygwin.def index 11bca921..980ebc77 100644 --- a/externals/grill/flext/buildsys/win/pd/config-cygwin.def +++ b/externals/grill/flext/buildsys/win/pd/config-cygwin.def @@ -1,5 +1,5 @@ # where is PD? -PDPATH=/cygdrive/c/programme/audio/pd +PDPATH=/cygdrive/c/programme/pd ############################################################### @@ -10,7 +10,7 @@ FLEXTINC=$(PDPATH)/flext FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +FLEXTSHLIB=$(PDPATH)/bin ############################################################### @@ -24,4 +24,6 @@ INSTPATH=$(PDPATH)/extra # user defined compiler flags # (check if they match your system!) -OFLAGS=-O2 -march=pentium4 -msse +OFLAGS=-O2 +# optimizations for Pentium 4 +#OFLAGS += -march=pentium4 -msse diff --git a/externals/grill/flext/buildsys/win/pd/config-mingw.def b/externals/grill/flext/buildsys/win/pd/config-mingw.def index 7b720f58..9a65dfd9 100644 --- a/externals/grill/flext/buildsys/win/pd/config-mingw.def +++ b/externals/grill/flext/buildsys/win/pd/config-mingw.def @@ -1,16 +1,16 @@ # where is PD? -PDPATH=c:/programme/audio/pd +PDPATH="%ProgramFiles%\pd" ############################################################### # where do/should the flext headers reside/be built? -FLEXTINC=$(PDPATH)/flext +FLEXTINC=$(PDPATH)\flext # where do/should the flext static libraries reside/be built? FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +FLEXTSHLIB=$(PDPATH)\bin ############################################################### @@ -18,10 +18,12 @@ FLEXTSHLIB=$(FLEXTINC) OUTPATH=pd-mingw # where should the external be installed? -INSTPATH=$(PDPATH)/extra +INSTPATH=$(PDPATH)\extra ############################################################### # user defined compiler flags # (check if they match your system!) -OFLAGS=-O2 -march=pentium4 -msse +OFLAGS=-O2 +# optimizations for Pentium 4 +#OFLAGS += -march=pentium4 -msse diff --git a/externals/grill/flext/buildsys/win/pd/config-msvc.def b/externals/grill/flext/buildsys/win/pd/config-msvc.def index a7171ff2..7d808765 100644 --- a/externals/grill/flext/buildsys/win/pd/config-msvc.def +++ b/externals/grill/flext/buildsys/win/pd/config-msvc.def @@ -1,9 +1,9 @@ # where is PD? -PDPATH=c:\programme\audio\pd +PDPATH="%ProgramFiles%\pd" # where is MS VC++? # (not necessary if the build is run with the compiler environment) -# MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 +# MSVCPATH="%ProgramFiles%\Microsoft Visual Studio .NET 2003\Vc7" ############################################################### @@ -14,7 +14,7 @@ FLEXTINC=$(PDPATH)\flext FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +FLEXTSHLIB=$(PDPATH)\bin ############################################################### @@ -29,7 +29,9 @@ INSTPATH=$(PDPATH)\extra # user defined compiler flags # (check if they match your system!) -OFLAGS=/G6 /Ox /arch:SSE +OFLAGS=/Ox +# optimizations for Pentium 4 +#OFLAGS=$(OFLAGS) /G6 /arch:SSE # uncomment to link against dynamic C runtime libraries # (don't use this if you want to distribute the built product) diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc index b2234c5b..26bcf06e 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc @@ -1 +1 @@ -EXT=dll +EXT=dll diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc index 5c8a7a83..e64eb6c5 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc @@ -1,5 +1,5 @@ -ifdef SHARED -EXT=dll -else -EXT=a -endif +ifdef SHARED +EXT=dll +else +EXT=a +endif diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc index 054526c0..017635ae 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc @@ -3,7 +3,7 @@ DEFS += -DFLEXT_SYS=2 INCPATH += -I$(PDPATH)/src # trick PD in a way that only the cygwin pthread headers are used -CFLAGS += -include /usr/include/pthread.h -DPTHREAD_H +CFLAGS += -include /usr/include/sched.h -include /usr/include/pthread.h -DPTHREAD_H LIBS += $(PDPATH)/bin/pd.dll #LIBS += $(PDPATH)/bin/pthreadVC.dll diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc index b2234c5b..26bcf06e 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc @@ -1 +1 @@ -EXT=dll +EXT=dll diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc index 5c8a7a83..e64eb6c5 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc @@ -1,5 +1,5 @@ -ifdef SHARED -EXT=dll -else -EXT=a -endif +ifdef SHARED +EXT=dll +else +EXT=a +endif diff --git a/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc b/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc index b2234c5b..26bcf06e 100644 --- a/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc +++ b/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc @@ -1 +1 @@ -EXT=dll +EXT=dll diff --git a/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc b/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc index a080ae72..d30a7144 100644 --- a/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc +++ b/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc @@ -1,5 +1,5 @@ -!ifdef SHARED -EXT=dll -!else -EXT=lib -!endif +!ifdef SHARED +EXT=dll +!else +EXT=lib +!endif -- cgit v1.2.1