From f688c9de1efee2e09fbb9b39a715853b23fadcb3 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Fri, 17 Dec 2004 05:01:18 +0000 Subject: global system lock functions fixed a thread sensitive spot fix for _long_ attribute dialogs build system for flext-based externals typo fixed in attribute editor atom outlet functions svn path=/trunk/; revision=2394 --- .../grill/flext/build/config-win-max-msvc.def | 22 +++++++ .../grill/flext/build/config-win-max-msvc.txt | 22 +++++++ externals/grill/flext/build/config-win-pd-msvc.def | 20 +++++++ externals/grill/flext/build/config-win-pd-msvc.txt | 20 +++++++ externals/grill/flext/build/make-win-gen-msvc.inc | 67 ++++++++++++++++++++++ externals/grill/flext/build/make-win-max-msvc.inc | 35 +++++++++++ externals/grill/flext/build/make-win-msvc.inc | 22 +++++++ externals/grill/flext/build/make-win-pd-msvc.inc | 34 +++++++++++ 8 files changed, 242 insertions(+) create mode 100644 externals/grill/flext/build/config-win-max-msvc.def create mode 100644 externals/grill/flext/build/config-win-max-msvc.txt create mode 100644 externals/grill/flext/build/config-win-pd-msvc.def create mode 100644 externals/grill/flext/build/config-win-pd-msvc.txt create mode 100644 externals/grill/flext/build/make-win-gen-msvc.inc create mode 100644 externals/grill/flext/build/make-win-max-msvc.inc create mode 100644 externals/grill/flext/build/make-win-msvc.inc create mode 100644 externals/grill/flext/build/make-win-pd-msvc.inc (limited to 'externals/grill/flext/build') diff --git a/externals/grill/flext/build/config-win-max-msvc.def b/externals/grill/flext/build/config-win-max-msvc.def new file mode 100644 index 00000000..c1192ad4 --- /dev/null +++ b/externals/grill/flext/build/config-win-max-msvc.def @@ -0,0 +1,22 @@ +# 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 do the flext libraries reside? +FLEXTPATH="%CommonProgramFiles%\Cycling '74\flext" + +# where is MS VC++? +# (need not be defined if the build is started with the compiler environment set) +# MSVCPATH="c:\programme\prog\microsoft visual studio\VC98" + +# where should the external be built? +# (path for temporary files) +OUTPATH=max-msvc + +# where should the external be installed? +# (leave blank to omit installation) +INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext" + +# some user-definable flags +# (check if they match your system!) +UFLAGS=/G6 /Ox /arch:SSE diff --git a/externals/grill/flext/build/config-win-max-msvc.txt b/externals/grill/flext/build/config-win-max-msvc.txt new file mode 100644 index 00000000..c1192ad4 --- /dev/null +++ b/externals/grill/flext/build/config-win-max-msvc.txt @@ -0,0 +1,22 @@ +# 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 do the flext libraries reside? +FLEXTPATH="%CommonProgramFiles%\Cycling '74\flext" + +# where is MS VC++? +# (need not be defined if the build is started with the compiler environment set) +# MSVCPATH="c:\programme\prog\microsoft visual studio\VC98" + +# where should the external be built? +# (path for temporary files) +OUTPATH=max-msvc + +# where should the external be installed? +# (leave blank to omit installation) +INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext" + +# some user-definable flags +# (check if they match your system!) +UFLAGS=/G6 /Ox /arch:SSE diff --git a/externals/grill/flext/build/config-win-pd-msvc.def b/externals/grill/flext/build/config-win-pd-msvc.def new file mode 100644 index 00000000..bdce5879 --- /dev/null +++ b/externals/grill/flext/build/config-win-pd-msvc.def @@ -0,0 +1,20 @@ +# where is PD? +PDPATH=c:\programme\audio\pd + +# where do the flext libraries reside? +FLEXTPATH=$(PDPATH)\flext + +# where is MS VC++? +# (not necessary if the build is run with the compiler environment) +# MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 + +# where should the external be built? +OUTPATH=pd-msvc + +# where should the external be installed? +# (leave blank to omit installation) +INSTPATH=$(PDPATH)\extra + +# user defined compiler flags +# (check if they match your system!) +UFLAGS=/G6 /Ox /arch:SSE diff --git a/externals/grill/flext/build/config-win-pd-msvc.txt b/externals/grill/flext/build/config-win-pd-msvc.txt new file mode 100644 index 00000000..bdce5879 --- /dev/null +++ b/externals/grill/flext/build/config-win-pd-msvc.txt @@ -0,0 +1,20 @@ +# where is PD? +PDPATH=c:\programme\audio\pd + +# where do the flext libraries reside? +FLEXTPATH=$(PDPATH)\flext + +# where is MS VC++? +# (not necessary if the build is run with the compiler environment) +# MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 + +# where should the external be built? +OUTPATH=pd-msvc + +# where should the external be installed? +# (leave blank to omit installation) +INSTPATH=$(PDPATH)\extra + +# user defined compiler flags +# (check if they match your system!) +UFLAGS=/G6 /Ox /arch:SSE diff --git a/externals/grill/flext/build/make-win-gen-msvc.inc b/externals/grill/flext/build/make-win-gen-msvc.inc new file mode 100644 index 00000000..0538f63e --- /dev/null +++ b/externals/grill/flext/build/make-win-gen-msvc.inc @@ -0,0 +1,67 @@ +INCPATH=$(INCPATH) /I$(FLEXTPATH) +LIBPATH=$(LIBPATH) /LIBPATH:$(FLEXTPATH) + +!ifdef MSVCPATH +INCPATH=$(INCPATH) /I$(MSVCPATH)\include +LIBPATH=$(LIBPATH) /LIBPATH:$(MSVCPATH)\lib +!endif + +# add user flags +CFLAGS=$(UFLAGS) + +# for VC7 - exception handling +CFLAGS=$(CFLAGS) /EHsc + +############################################## + +# use multithreaded static libraries +!ifdef _DEBUG +CFLAGS=$(CFLAGS) /DMTd +!else +CFLAGS=$(CFLAGS) /DMT +!endif + +!ifdef FLEXT_SHARED +# --- shared --- +DEFS=$(DEFS) /DFLEXT_SHARED + +!elseifdef FLEXT_THREADED +# --- static multi-threaded --- +DEFS=$(DEFS) /DFLEXT_THREADS + +!else +# --- static single-threaded --- + +!endif + +############################################## + +all: $(OUTPATH) $(OUTPATH)\$(NAME).$(EXT) + +# remove build +clean: + -del /q $(OUTPATH) > nul + -rmdir $(OUTPATH) > nul + +OBJS= $(SRCS:.c=.obj) +OBJS= $(OBJS:.objpp=.obj) + +$(OUTPATH): + -mkdir $(OUTPATH) > nul + +{$(SRCDIR)}.cpp{}.obj: + cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)\$@ + +{$(SRCDIR)}.c{}.obj: + cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)\$@ + +$(OUTPATH)\$(NAME).$(EXT): $(OBJS) + cd $(OUTPATH) + link /DLL $(LDFLAGS) /out:$(NAME).$(EXT) /INCREMENTAL:NO $** $(LIBS) $(LIBPATH) + @-del *.exp + @-del *.lib + cd .. +!ifdef INSTPATH + @-if not exist $(INSTPATH) mkdir $(INSTPATH) + copy $@ $(INSTPATH) > nul +!endif diff --git a/externals/grill/flext/build/make-win-max-msvc.inc b/externals/grill/flext/build/make-win-max-msvc.inc new file mode 100644 index 00000000..eb03a828 --- /dev/null +++ b/externals/grill/flext/build/make-win-max-msvc.inc @@ -0,0 +1,35 @@ +DEFS=$(DEFS) /DFLEXT_SYS=1 +CFLAGS=$(CFLAGS) /Zp2 + +INCPATH=$(INCPATH) /I$(MAXSDKPATH)\max-includes /I$(MAXSDKPATH)\msp-includes +LIBPATH=$(LIBPATH) /LIBPATH:$(MAXSDKPATH)\max-includes /LIBPATH:$(MAXSDKPATH)\msp-includes + +# these are both in MAXSDKPATH +LIBS=$(LIBS) maxapi.lib maxaudio.lib + +EXT=mxe + +######################################### + +!ifdef FLEXT_SHARED +# --- shared --- + +!elseifdef FLEXT_THREADED +# --- static multi-threaded --- + +!ifdef _DEBUG +LIBS=$(LIBS) flext_td-maxwin.lib +!else +LIBS=$(LIBS) flext_t-maxwin.lib +!endif + +!else +# --- static single-threaded --- + +!ifdef _DEBUG +LIBS=$(LIBS) flext_d-maxwin.lib +!else +LIBS=$(LIBS) flext-maxwin.lib +!endif + +!endif diff --git a/externals/grill/flext/build/make-win-msvc.inc b/externals/grill/flext/build/make-win-msvc.inc new file mode 100644 index 00000000..56b4deee --- /dev/null +++ b/externals/grill/flext/build/make-win-msvc.inc @@ -0,0 +1,22 @@ +!ifdef $(MAX) +# Max/MSP +!include config-pd-msvc.txt +!include makefile-msvc.txt +!include ..\flext\build\make-win-max-msvc.inc + +!elseifdef $(PD) +# PD +!include config-pd-msvc.txt +!include makefile-msvc.txt +!include ..\flext\build\make-win-pd-msvc.inc + +!else +!error Platform not supported +!endif + +# all the source files from the package +!include make-files.txt + +# now build +!include ..\flext\build\make-win-gen-msvc.inc + diff --git a/externals/grill/flext/build/make-win-pd-msvc.inc b/externals/grill/flext/build/make-win-pd-msvc.inc new file mode 100644 index 00000000..41cbfd20 --- /dev/null +++ b/externals/grill/flext/build/make-win-pd-msvc.inc @@ -0,0 +1,34 @@ +DEFS=$(DEFS) /DFLEXT_SYS=2 + +INCPATH=$(INCPATH) /I$(PDPATH)\src +LIBPATH=$(LIBPATH) /LIBPATH:$(PDPATH)\bin + +# these are both in PDPATH +LIBS=$(LIBS) pd.lib pthreadVC.lib + +EXT=dll + +######################################### + +!ifdef FLEXT_SHARED +# --- shared --- + +!elseifdef FLEXT_THREADED +# --- static multi-threaded --- + +!ifdef _DEBUG +LIBS=$(LIBS) flext_td-pdwin.lib +!else +LIBS=$(LIBS) flext_t-pdwin.lib +!endif + +!else +# --- static single-threaded --- + +!ifdef _DEBUG +LIBS=$(LIBS) flext_d-pdwin.lib +!else +LIBS=$(LIBS) flext-pdwin.lib +!endif + +!endif -- cgit v1.2.1