From b1224f91730af6a729f7e7a428eb660a6d734926 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Wed, 20 Sep 2006 14:24:10 +0000 Subject: enabled templates for flext classes, inlined timer functions, some more ToOut/Sys methods fixed help name definition added flfeatures.h for compile-time version-specific feature detection changed eol-style adapted for pd-devel 0.39 minimal fix for timers cosmetic changes to calm the compiler changes for Mac/Intel svn path=/trunk/; revision=5979 --- externals/grill/flext/buildsys/gnumake-ext.inc | 2 +- externals/grill/flext/buildsys/gnumake-flext.inc | 6 +- externals/grill/flext/buildsys/gnumake.inc | 140 ++++----- externals/grill/flext/buildsys/nmake-ext.inc | 2 +- externals/grill/flext/buildsys/nmake-flext.inc | 6 +- externals/grill/flext/buildsys/nmake-shlib.inc | 2 +- externals/grill/flext/buildsys/nmake.inc | 128 ++++---- externals/grill/flext/buildsys/readme.txt | 360 +++++++++++------------ externals/grill/flext/buildsys/targets-ext.inc | 102 +++---- externals/grill/flext/buildsys/targets-flext.inc | 104 +++---- externals/grill/flext/buildsys/targets-shlib.inc | 102 +++---- externals/grill/flext/buildsys/targets.inc | 296 +++++++++---------- 12 files changed, 625 insertions(+), 625 deletions(-) (limited to 'externals/grill/flext/buildsys') diff --git a/externals/grill/flext/buildsys/gnumake-ext.inc b/externals/grill/flext/buildsys/gnumake-ext.inc index d959aaca..1455c83e 100644 --- a/externals/grill/flext/buildsys/gnumake-ext.inc +++ b/externals/grill/flext/buildsys/gnumake-ext.inc @@ -1 +1 @@ -OUTNAME=$(NAME) +OUTNAME=$(NAME) diff --git a/externals/grill/flext/buildsys/gnumake-flext.inc b/externals/grill/flext/buildsys/gnumake-flext.inc index f6ec8f65..64204656 100644 --- a/externals/grill/flext/buildsys/gnumake-flext.inc +++ b/externals/grill/flext/buildsys/gnumake-flext.inc @@ -1,3 +1,3 @@ -DEFS+=-DFLEXT_EXPORTS - -OUTNAME=lib$(FLEXTNAME) +DEFS+=-DFLEXT_EXPORTS + +OUTNAME=lib$(FLEXTNAME) diff --git a/externals/grill/flext/buildsys/gnumake.inc b/externals/grill/flext/buildsys/gnumake.inc index 93203f36..4d8a9b7f 100644 --- a/externals/grill/flext/buildsys/gnumake.inc +++ b/externals/grill/flext/buildsys/gnumake.inc @@ -1,70 +1,70 @@ -############################################## -# some compiler definitions -############################################## - -CFLAGS += $(UFLAGS) - -ifdef DEBUG -CFLAGS += -D_DEBUG $(DFLAGS) -else -ifdef PROFILE -CFLAGS += -DNDEBUG $(OFLAGS) -else -CFLAGS += -DNDEBUG $(OFLAGS) -endif -endif - - -ifdef SHARED -# --- shared --- -DEFS+=-DFLEXT_SHARED - -else -ifdef THREADED -# --- static multi-threaded --- -DEFS+=-DFLEXT_THREADS - -else -# --- static single-threaded --- - -endif -endif - -############################################## -# name of flext library -############################################## - -ifdef SHARED -TYPEEXT=_ -else -ifdef THREADED -TYPEEXT=_t -else -TYPEEXT=_s -endif -endif - -ifdef DEBUG -MODEEXT=d -else -ifdef PROFILE -MODEEXT=p -else -MODEEXT= -ifdef SHARED -TYPEEXT= -endif -endif -endif - -FLEXTNAME=flext-$(RTSYS)$(TYPEEXT)$(MODEEXT) - -############################################## -# product name and folder -############################################## - -ifndef SRCDIR -SRCDIR=. -endif - -OUTSUB=$(TARGETMODE)-$(TARGETTYPE) +############################################## +# some compiler definitions +############################################## + +CFLAGS += $(UFLAGS) + +ifdef DEBUG +CFLAGS += -D_DEBUG $(DFLAGS) +else +ifdef PROFILE +CFLAGS += -DNDEBUG $(OFLAGS) +else +CFLAGS += -DNDEBUG $(OFLAGS) +endif +endif + + +ifdef SHARED +# --- shared --- +DEFS+=-DFLEXT_SHARED + +else +ifdef THREADED +# --- static multi-threaded --- +DEFS+=-DFLEXT_THREADS + +else +# --- static single-threaded --- + +endif +endif + +############################################## +# name of flext library +############################################## + +ifdef SHARED +TYPEEXT=_ +else +ifdef THREADED +TYPEEXT=_t +else +TYPEEXT=_s +endif +endif + +ifdef DEBUG +MODEEXT=d +else +ifdef PROFILE +MODEEXT=p +else +MODEEXT= +ifdef SHARED +TYPEEXT= +endif +endif +endif + +FLEXTNAME=flext-$(RTSYS)$(TYPEEXT)$(MODEEXT) + +############################################## +# product name and folder +############################################## + +ifndef SRCDIR +SRCDIR=. +endif + +OUTSUB=$(TARGETMODE)-$(TARGETTYPE) diff --git a/externals/grill/flext/buildsys/nmake-ext.inc b/externals/grill/flext/buildsys/nmake-ext.inc index d959aaca..1455c83e 100644 --- a/externals/grill/flext/buildsys/nmake-ext.inc +++ b/externals/grill/flext/buildsys/nmake-ext.inc @@ -1 +1 @@ -OUTNAME=$(NAME) +OUTNAME=$(NAME) diff --git a/externals/grill/flext/buildsys/nmake-flext.inc b/externals/grill/flext/buildsys/nmake-flext.inc index 8d3f177c..2e7faf0c 100644 --- a/externals/grill/flext/buildsys/nmake-flext.inc +++ b/externals/grill/flext/buildsys/nmake-flext.inc @@ -1,3 +1,3 @@ -DEFS=$(DEFS) /DFLEXT_EXPORTS - -OUTNAME=$(FLEXTNAME) +DEFS=$(DEFS) /DFLEXT_EXPORTS + +OUTNAME=$(FLEXTNAME) diff --git a/externals/grill/flext/buildsys/nmake-shlib.inc b/externals/grill/flext/buildsys/nmake-shlib.inc index d959aaca..1455c83e 100644 --- a/externals/grill/flext/buildsys/nmake-shlib.inc +++ b/externals/grill/flext/buildsys/nmake-shlib.inc @@ -1 +1 @@ -OUTNAME=$(NAME) +OUTNAME=$(NAME) diff --git a/externals/grill/flext/buildsys/nmake.inc b/externals/grill/flext/buildsys/nmake.inc index 888d5328..fd1bb50d 100644 --- a/externals/grill/flext/buildsys/nmake.inc +++ b/externals/grill/flext/buildsys/nmake.inc @@ -1,64 +1,64 @@ -############################################## -# flext defines -############################################## - -CFLAGS=$(CFLAGS) $(UFLAGS) - -!ifdef DEBUG -CFLAGS=$(CFLAGS) /D_DEBUG $(DFLAGS) -!else -CFLAGS=$(CFLAGS) /DNDEBUG $(OFLAGS) -!endif - - -!ifdef SHARED -# --- shared --- -DEFS=$(DEFS) /DFLEXT_SHARED - -!elseifdef THREADED -# --- static multi-threaded --- -DEFS=$(DEFS) /DFLEXT_THREADS - -!else -# --- static single-threaded --- - -!endif - -############################################## -# name of flext library -############################################## - -!ifdef SHARED -TYPEEXT=_ -!else -!ifdef THREADED -TYPEEXT=_t -!else -TYPEEXT=_s -!endif -!endif - -!ifdef DEBUG -MODEEXT=d -!else -!ifdef PROFILE -MODEEXT=p -!else -MODEEXT= -!ifdef SHARED -TYPEEXT= -!endif -!endif -!endif - -FLEXTNAME=flext-$(RTSYS)$(TYPEEXT)$(MODEEXT) - -############################################## -# product name and folder -############################################## - -!ifndef SRCDIR -SRCDIR=. -!endif - -OUTSUB=$(TARGETMODE)-$(TARGETTYPE) +############################################## +# flext defines +############################################## + +CFLAGS=$(CFLAGS) $(UFLAGS) + +!ifdef DEBUG +CFLAGS=$(CFLAGS) /D_DEBUG $(DFLAGS) +!else +CFLAGS=$(CFLAGS) /DNDEBUG $(OFLAGS) +!endif + + +!ifdef SHARED +# --- shared --- +DEFS=$(DEFS) /DFLEXT_SHARED + +!elseifdef THREADED +# --- static multi-threaded --- +DEFS=$(DEFS) /DFLEXT_THREADS + +!else +# --- static single-threaded --- + +!endif + +############################################## +# name of flext library +############################################## + +!ifdef SHARED +TYPEEXT=_ +!else +!ifdef THREADED +TYPEEXT=_t +!else +TYPEEXT=_s +!endif +!endif + +!ifdef DEBUG +MODEEXT=d +!else +!ifdef PROFILE +MODEEXT=p +!else +MODEEXT= +!ifdef SHARED +TYPEEXT= +!endif +!endif +!endif + +FLEXTNAME=flext-$(RTSYS)$(TYPEEXT)$(MODEEXT) + +############################################## +# product name and folder +############################################## + +!ifndef SRCDIR +SRCDIR=. +!endif + +OUTSUB=$(TARGETMODE)-$(TARGETTYPE) diff --git a/externals/grill/flext/buildsys/readme.txt b/externals/grill/flext/buildsys/readme.txt index 434f479e..4fa74ad4 100644 --- a/externals/grill/flext/buildsys/readme.txt +++ b/externals/grill/flext/buildsys/readme.txt @@ -1,180 +1,180 @@ -flext - C++ layer for Max/MSP and pd (pure data) externals - -Copyright (c) 2001-2005 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. - ----------------------------------------------------------------------------- - -At the moment this is more like a sketchboard, but i'll promise to bring some -order into it some fine day in the not too distant future. - ----------------------------------------------------------------------------- - -Build scripts -============= - -Depending on platform the build process is run with -build.sh -or -build.bat - - -Arguments: PLATFORM SYSTEM COMPILER {TARGET} {definitions} - -PLATFORM: win / lnx / mac -SYSTEM: pd / max -COMPILER: msvc / gcc / mingw / cygwin / bcc / icc - -TARGET: (default is all) - all, build - build package in default style - install - install package - clean - clean build products - - config - test if configuration needs refreshing - -or - build-MODE-TYPE - install-MODE-TYPE - clean-MODE-TYPE - -with - MODE: default, all, release, debug, profile - TYPE: default, all, single, multi, shared - - -Additional definitions can be passed to the make program -like - "PKGINFO=info.txt" (defines new filename for package information) -or - "PKGINFO=" (package information will be skipped - only for config target) - -For more macro names, see below - - -For each of the supported combinations of PLATFORM, SYSTEM and COMPILER -a MAKE program has been chosen, normally the one that comes with the compiler. - -For gcc it is GNU make (gnumake) -For msvc it is Microsoft make (nmake) -For bcc it is Borland make (bmake) - - - -Package info (package.txt) -========================== - -Package information contains vital information for the build process. -Obligatory are only: - -NAME: resulting filename of the build product -SRCS: list of source files - - -Normally also used are: - -HDRS: used header files, which SRCS files are dependent upon -SRCDIR: source folder (relative to project folder), default is . - - -Other settings: - -PRECOMPILE: prefix header file (in SRCDIR) for all source files, - will be precompiled if supported by the compiler - -BUILDCLASS: can currently be flext or ext, default is ext. - flext will build the flext system - ext will build a flext-based external - -BUILDMODE: release or debug, default is release - if release, optimization flags will be used - if debug, debug information will be generated - if profile, profiling information will be generated (with debug info and optimization) - -BUILDTYPE: single, multi or shared, default is single - if single, it will be linked against the single-threaded static flext library - if multi, it will be linked against the multi-threaded static flext library - if shared, it will be linked against the shared flext library - -BUILDDIR: relative folder with additional build settings - - - -Additional build settings (BUILDDIR) -==================================== - -If BUILDDIR is defined, all PLATFORM-SYSTEM-COMPILER combinations to support -must are mirrored by the respective .def and .inc files in the BUILDDIR. - - -config-PLATFORM.def files (e.g. config-lnx.def) : - - These files can contain additional macro definitions, that are private - to the project. - The definitions should be strictly in the form SETTING=value, without any - make-specific macros etc. - The .def files work as templates that get copied to a user-editable - config.txt file when the build process is first started. - - -MAKE-PLATFORM-COMPILER.inc files -(e.g. gnumake-lnx-gcc.inc or nmake-win-msvc.inc): - - These files (which are no considered to be edited by the user) can contain - specific modifications to compiler flags, include file paths etc. - - For gnumake this would e.g. be - INCPATH += -I/usr/local/include/python2.3 - - for nmake or bmake e.g. - INCPATH = $(INCPATH) -I"c:\program files\Python2.3\include" - - -Structure of build system -========================= - -The build system has several levels of information, which are evaluated in the -following order (see also buildsys/MAKE-sub.mak) - -Project level: -- PKGINFO file (e.g. package.txt) -- USRCONFIG file (e.g. config.txt) -- USRMAKE file (e.g. build/gnumake-lnx-gcc.inc) - -General definitions (in buildsys): - -- MAKE.inc (e.g. buildsys/gnumake.inc) - contains evaluation of flext library name, build directory etc. -- MAKE-BUILDCLASS.inc (e.g. buildsys/gnumake-ext.inc) - contains some more flag settings - -Real-time-system-dependent definitions (in buildsys/PLATFORM/SYSTEM): - -- MAKE-COMPILER.inc (e.g. buildsys/lnx/pd/gnumake-gcc.inc) - contains general real-time-system dependent info (e.g. paths, FLEXT_SYS setting) -- MAKE-COMPILER-BUILDCLASS.inc (e.g. buildsys/lnx/pd/gnumake-gcc-ext.inc) - contains specific real-time-system dependent info (e.g. extension of binary) - -Platform-dependent definitions (in buildsys/PLATFORM): - -- MAKE-COMPILER.inc (e.g. buildsys/lnx/gnumake-gcc.inc) - contains general platform-specific flags -- MAKE-COMPILER-BUILDCLASS.inc (e.g. buildsys/lnx/gnumake-gcc-ext.inc) - contains the actual make targets (_build_,_clean_ and _install_) - - -Macro names -=============== - -PKGINFO - filename for package information (must reside in project folder) - -UFLAGS - user defined compiler flags -OFLAGS - user defined optimization flags (not used in debug builds) - -CFLAGS - compiler flags -LDFLAGS - linker flags - -INCPATH - include file path (must come with e.g. -I ) -LIBPATH - library path (must come with e.g. -L ) - -LIBS - libraries to link in (must come with e.g. -l ) +flext - C++ layer for Max/MSP and pd (pure data) externals + +Copyright (c) 2001-2005 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. + +---------------------------------------------------------------------------- + +At the moment this is more like a sketchboard, but i'll promise to bring some +order into it some fine day in the not too distant future. + +---------------------------------------------------------------------------- + +Build scripts +============= + +Depending on platform the build process is run with +build.sh +or +build.bat + + +Arguments: PLATFORM SYSTEM COMPILER {TARGET} {definitions} + +PLATFORM: win / lnx / mac +SYSTEM: pd / max +COMPILER: msvc / gcc / mingw / cygwin / bcc / icc + +TARGET: (default is all) + all, build - build package in default style + install - install package + clean - clean build products + + config - test if configuration needs refreshing + +or + build-MODE-TYPE + install-MODE-TYPE + clean-MODE-TYPE + +with + MODE: default, all, release, debug, profile + TYPE: default, all, single, multi, shared + + +Additional definitions can be passed to the make program +like + "PKGINFO=info.txt" (defines new filename for package information) +or + "PKGINFO=" (package information will be skipped - only for config target) + +For more macro names, see below + + +For each of the supported combinations of PLATFORM, SYSTEM and COMPILER +a MAKE program has been chosen, normally the one that comes with the compiler. + +For gcc it is GNU make (gnumake) +For msvc it is Microsoft make (nmake) +For bcc it is Borland make (bmake) + + + +Package info (package.txt) +========================== + +Package information contains vital information for the build process. +Obligatory are only: + +NAME: resulting filename of the build product +SRCS: list of source files + + +Normally also used are: + +HDRS: used header files, which SRCS files are dependent upon +SRCDIR: source folder (relative to project folder), default is . + + +Other settings: + +PRECOMPILE: prefix header file (in SRCDIR) for all source files, + will be precompiled if supported by the compiler + +BUILDCLASS: can currently be flext or ext, default is ext. + flext will build the flext system + ext will build a flext-based external + +BUILDMODE: release or debug, default is release + if release, optimization flags will be used + if debug, debug information will be generated + if profile, profiling information will be generated (with debug info and optimization) + +BUILDTYPE: single, multi or shared, default is single + if single, it will be linked against the single-threaded static flext library + if multi, it will be linked against the multi-threaded static flext library + if shared, it will be linked against the shared flext library + +BUILDDIR: relative folder with additional build settings + + + +Additional build settings (BUILDDIR) +==================================== + +If BUILDDIR is defined, all PLATFORM-SYSTEM-COMPILER combinations to support +must are mirrored by the respective .def and .inc files in the BUILDDIR. + + +config-PLATFORM.def files (e.g. config-lnx.def) : + + These files can contain additional macro definitions, that are private + to the project. + The definitions should be strictly in the form SETTING=value, without any + make-specific macros etc. + The .def files work as templates that get copied to a user-editable + config.txt file when the build process is first started. + + +MAKE-PLATFORM-COMPILER.inc files +(e.g. gnumake-lnx-gcc.inc or nmake-win-msvc.inc): + + These files (which are no considered to be edited by the user) can contain + specific modifications to compiler flags, include file paths etc. + + For gnumake this would e.g. be + INCPATH += -I/usr/local/include/python2.3 + + for nmake or bmake e.g. + INCPATH = $(INCPATH) -I"c:\program files\Python2.3\include" + + +Structure of build system +========================= + +The build system has several levels of information, which are evaluated in the +following order (see also buildsys/MAKE-sub.mak) + +Project level: +- PKGINFO file (e.g. package.txt) +- USRCONFIG file (e.g. config.txt) +- USRMAKE file (e.g. build/gnumake-lnx-gcc.inc) + +General definitions (in buildsys): + +- MAKE.inc (e.g. buildsys/gnumake.inc) + contains evaluation of flext library name, build directory etc. +- MAKE-BUILDCLASS.inc (e.g. buildsys/gnumake-ext.inc) + contains some more flag settings + +Real-time-system-dependent definitions (in buildsys/PLATFORM/SYSTEM): + +- MAKE-COMPILER.inc (e.g. buildsys/lnx/pd/gnumake-gcc.inc) + contains general real-time-system dependent info (e.g. paths, FLEXT_SYS setting) +- MAKE-COMPILER-BUILDCLASS.inc (e.g. buildsys/lnx/pd/gnumake-gcc-ext.inc) + contains specific real-time-system dependent info (e.g. extension of binary) + +Platform-dependent definitions (in buildsys/PLATFORM): + +- MAKE-COMPILER.inc (e.g. buildsys/lnx/gnumake-gcc.inc) + contains general platform-specific flags +- MAKE-COMPILER-BUILDCLASS.inc (e.g. buildsys/lnx/gnumake-gcc-ext.inc) + contains the actual make targets (_build_,_clean_ and _install_) + + +Macro names +=============== + +PKGINFO - filename for package information (must reside in project folder) + +UFLAGS - user defined compiler flags +OFLAGS - user defined optimization flags (not used in debug builds) + +CFLAGS - compiler flags +LDFLAGS - linker flags + +INCPATH - include file path (must come with e.g. -I ) +LIBPATH - library path (must come with e.g. -L ) + +LIBS - libraries to link in (must come with e.g. -l ) diff --git a/externals/grill/flext/buildsys/targets-ext.inc b/externals/grill/flext/buildsys/targets-ext.inc index bd9d733e..b8031522 100644 --- a/externals/grill/flext/buildsys/targets-ext.inc +++ b/externals/grill/flext/buildsys/targets-ext.inc @@ -1,51 +1,51 @@ -build-default-default: build-$(BUILDMODE)-$(BUILDTYPE) - -build-all-default: build-all-$(BUILDTYPE) - -build-release-default: build-release-$(BUILDTYPE) - -build-debug-default: build-debug-$(BUILDTYPE) - -build-profile-default: build-profile-$(BUILDTYPE) - -build-default-all: build-$(BUILDMODE)-all - -build-default-single: build-$(BUILDMODE)-single - -build-default-multi: build-$(BUILDMODE)-multi - -build-default-shared: build-$(BUILDMODE)-shared - - -install-default-default: install-$(BUILDMODE)-$(BUILDTYPE) - -install-all-default: install-all-$(BUILDTYPE) - -install-release-default: install-release-$(BUILDTYPE) - -install-debug-default: install-debug-$(BUILDTYPE) - -install-default-all: install-$(BUILDMODE)-all - -install-default-single: install-$(BUILDMODE)-single - -install-default-multi: install-$(BUILDMODE)-multi - -install-default-shared: install-$(BUILDMODE)-shared - - -clean-default-default: clean-$(BUILDMODE)-$(BUILDTYPE) - -clean-all-default: clean-all-$(BUILDTYPE) - -clean-release-default: clean-release-$(BUILDTYPE) - -clean-debug-default: clean-debug-$(BUILDTYPE) - -clean-default-all: clean-$(BUILDMODE)-all - -clean-default-single: clean-$(BUILDMODE)-single - -clean-default-multi: clean-$(BUILDMODE)-multi - -clean-default-shared: clean-$(BUILDMODE)-shared +build-default-default: build-$(BUILDMODE)-$(BUILDTYPE) + +build-all-default: build-all-$(BUILDTYPE) + +build-release-default: build-release-$(BUILDTYPE) + +build-debug-default: build-debug-$(BUILDTYPE) + +build-profile-default: build-profile-$(BUILDTYPE) + +build-default-all: build-$(BUILDMODE)-all + +build-default-single: build-$(BUILDMODE)-single + +build-default-multi: build-$(BUILDMODE)-multi + +build-default-shared: build-$(BUILDMODE)-shared + + +install-default-default: install-$(BUILDMODE)-$(BUILDTYPE) + +install-all-default: install-all-$(BUILDTYPE) + +install-release-default: install-release-$(BUILDTYPE) + +install-debug-default: install-debug-$(BUILDTYPE) + +install-default-all: install-$(BUILDMODE)-all + +install-default-single: install-$(BUILDMODE)-single + +install-default-multi: install-$(BUILDMODE)-multi + +install-default-shared: install-$(BUILDMODE)-shared + + +clean-default-default: clean-$(BUILDMODE)-$(BUILDTYPE) + +clean-all-default: clean-all-$(BUILDTYPE) + +clean-release-default: clean-release-$(BUILDTYPE) + +clean-debug-default: clean-debug-$(BUILDTYPE) + +clean-default-all: clean-$(BUILDMODE)-all + +clean-default-single: clean-$(BUILDMODE)-single + +clean-default-multi: clean-$(BUILDMODE)-multi + +clean-default-shared: clean-$(BUILDMODE)-shared diff --git a/externals/grill/flext/buildsys/targets-flext.inc b/externals/grill/flext/buildsys/targets-flext.inc index 83772b94..e0e984cf 100644 --- a/externals/grill/flext/buildsys/targets-flext.inc +++ b/externals/grill/flext/buildsys/targets-flext.inc @@ -1,52 +1,52 @@ -build-default-default: build-all-all - -build-all-default: build-all-all - -build-release-default: build-release-all - -build-debug-default: build-debug-all - -build-profile-default: build-profile-all - -build-default-all: build-all-all - -build-default-single: build-all-single - -build-default-multi: build-all-multi - -build-default-shared: build-all-shared - - -install-default-default: install-all-all - -install-all-default: install-all-all - -install-release-default: install-release-all - -install-debug-default: install-debug-all - -install-default-all: install-all-all - -install-default-single: install-all-single - -install-default-multi: install-all-multi - -install-default-shared: install-all-shared - - -clean-default-default: clean-all-all - -clean-all-default: clean-all-all - -clean-release-default: clean-release-all - -clean-debug-default: clean-debug-all - -clean-default-all: clean-all-all - -clean-default-single: clean-all-single - -clean-default-multi: clean-all-multi - -clean-default-shared: clean-all-shared - +build-default-default: build-all-all + +build-all-default: build-all-all + +build-release-default: build-release-all + +build-debug-default: build-debug-all + +build-profile-default: build-profile-all + +build-default-all: build-all-all + +build-default-single: build-all-single + +build-default-multi: build-all-multi + +build-default-shared: build-all-shared + + +install-default-default: install-all-all + +install-all-default: install-all-all + +install-release-default: install-release-all + +install-debug-default: install-debug-all + +install-default-all: install-all-all + +install-default-single: install-all-single + +install-default-multi: install-all-multi + +install-default-shared: install-all-shared + + +clean-default-default: clean-all-all + +clean-all-default: clean-all-all + +clean-release-default: clean-release-all + +clean-debug-default: clean-debug-all + +clean-default-all: clean-all-all + +clean-default-single: clean-all-single + +clean-default-multi: clean-all-multi + +clean-default-shared: clean-all-shared + diff --git a/externals/grill/flext/buildsys/targets-shlib.inc b/externals/grill/flext/buildsys/targets-shlib.inc index bd9d733e..b8031522 100644 --- a/externals/grill/flext/buildsys/targets-shlib.inc +++ b/externals/grill/flext/buildsys/targets-shlib.inc @@ -1,51 +1,51 @@ -build-default-default: build-$(BUILDMODE)-$(BUILDTYPE) - -build-all-default: build-all-$(BUILDTYPE) - -build-release-default: build-release-$(BUILDTYPE) - -build-debug-default: build-debug-$(BUILDTYPE) - -build-profile-default: build-profile-$(BUILDTYPE) - -build-default-all: build-$(BUILDMODE)-all - -build-default-single: build-$(BUILDMODE)-single - -build-default-multi: build-$(BUILDMODE)-multi - -build-default-shared: build-$(BUILDMODE)-shared - - -install-default-default: install-$(BUILDMODE)-$(BUILDTYPE) - -install-all-default: install-all-$(BUILDTYPE) - -install-release-default: install-release-$(BUILDTYPE) - -install-debug-default: install-debug-$(BUILDTYPE) - -install-default-all: install-$(BUILDMODE)-all - -install-default-single: install-$(BUILDMODE)-single - -install-default-multi: install-$(BUILDMODE)-multi - -install-default-shared: install-$(BUILDMODE)-shared - - -clean-default-default: clean-$(BUILDMODE)-$(BUILDTYPE) - -clean-all-default: clean-all-$(BUILDTYPE) - -clean-release-default: clean-release-$(BUILDTYPE) - -clean-debug-default: clean-debug-$(BUILDTYPE) - -clean-default-all: clean-$(BUILDMODE)-all - -clean-default-single: clean-$(BUILDMODE)-single - -clean-default-multi: clean-$(BUILDMODE)-multi - -clean-default-shared: clean-$(BUILDMODE)-shared +build-default-default: build-$(BUILDMODE)-$(BUILDTYPE) + +build-all-default: build-all-$(BUILDTYPE) + +build-release-default: build-release-$(BUILDTYPE) + +build-debug-default: build-debug-$(BUILDTYPE) + +build-profile-default: build-profile-$(BUILDTYPE) + +build-default-all: build-$(BUILDMODE)-all + +build-default-single: build-$(BUILDMODE)-single + +build-default-multi: build-$(BUILDMODE)-multi + +build-default-shared: build-$(BUILDMODE)-shared + + +install-default-default: install-$(BUILDMODE)-$(BUILDTYPE) + +install-all-default: install-all-$(BUILDTYPE) + +install-release-default: install-release-$(BUILDTYPE) + +install-debug-default: install-debug-$(BUILDTYPE) + +install-default-all: install-$(BUILDMODE)-all + +install-default-single: install-$(BUILDMODE)-single + +install-default-multi: install-$(BUILDMODE)-multi + +install-default-shared: install-$(BUILDMODE)-shared + + +clean-default-default: clean-$(BUILDMODE)-$(BUILDTYPE) + +clean-all-default: clean-all-$(BUILDTYPE) + +clean-release-default: clean-release-$(BUILDTYPE) + +clean-debug-default: clean-debug-$(BUILDTYPE) + +clean-default-all: clean-$(BUILDMODE)-all + +clean-default-single: clean-$(BUILDMODE)-single + +clean-default-multi: clean-$(BUILDMODE)-multi + +clean-default-shared: clean-$(BUILDMODE)-shared diff --git a/externals/grill/flext/buildsys/targets.inc b/externals/grill/flext/buildsys/targets.inc index a1ab4631..1c901410 100644 --- a/externals/grill/flext/buildsys/targets.inc +++ b/externals/grill/flext/buildsys/targets.inc @@ -1,148 +1,148 @@ -all: build - -build: build-default-default - -profile: build-profile-default - -clean: clean-default-default - -install: install-default-default - -########################################################### - -build-all-all: build-release-all build-debug-all - -build-release-all: build-release-single build-release-multi build-release-shared - -build-debug-all: build-debug-single build-debug-multi build-debug-shared - -build-profile-all: build-profile-single build-profile-multi build-profile-shared - -build-all-single: build-release-single build-debug-single - -build-all-multi: build-release-multi build-debug-multi - -build-all-shared: build-release-shared build-debug-shared - -################################################### - -install-all-all: install-release-all install-debug-all - -install-release-all: install-release-single install-release-multi install-release-shared - -install-debug-all: install-debug-single install-debug-multi install-debug-shared - -install-profile-all: install-profile-single install-profile-multi install-profile-shared - -install-all-single: install-release-single install-debug-single - -install-all-multi: install-release-multi install-debug-multi - -install-all-shared: install-release-shared install-debug-shared - -################################################### - -clean-all-all: clean-release-all clean-debug-all - -clean-release-all: clean-release-single clean-release-multi clean-release-shared - -clean-debug-all: clean-debug-single clean-debug-multi clean-debug-shared - -clean-profile-all: clean-profile-single clean-profile-multi clean-profile-shared - -clean-all-single: clean-release-single clean-debug-single - -clean-all-multi: clean-release-multi clean-debug-multi - -clean-all-shared: clean-release-shared clean-debug-shared - -########################################################### - -build-release-single: config - $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=single _build_ - -build-debug-single: config - $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _build_ - -build-profile-single: config - $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=single PROFILE=1 _build_ - -build-release-multi: config - $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _build_ - -build-debug-multi: config - $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _build_ - -build-profile-multi: config - $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=multi THREADED=1 PROFILE=1 _build_ - -build-release-shared: config - $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _build_ - -build-debug-shared: config - $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _build_ - -build-profile-shared: config - $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=shared SHARED=1 PROFILE=1 _build_ - -########################################################### - -install-release-single: config - $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=single _install_ - -install-debug-single: config - $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _install_ - -install-profile-single: config - $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=single PROFILE=1 _install_ - -install-release-multi: config - $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _install_ - -install-debug-multi: config - $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _install_ - -install-profile-multi: config - $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=multi THREADED=1 PROFILE=1 _install_ - -install-release-shared: config - $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _install_ - -install-debug-shared: config - $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _install_ - -install-profile-shared: config - $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=shared SHARED=1 PROFILE=1 _install_ - -########################################################### - -clean-release-single: config - $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=single _clean_ - -clean-debug-single: config - $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _clean_ - -clean-profile-single: config - $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=single PROFILE=1 _clean_ - -clean-release-multi: config - $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _clean_ - -clean-debug-multi: config - $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _clean_ - -clean-profile-multi: config - $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=multi THREADED=1 PROFILE=1 _clean_ - -clean-release-shared: config - $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _clean_ - -clean-debug-shared: config - $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _clean_ - -clean-profile-shared: config - $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=shared SHARED=1 PROFILE=1 _clean_ - -########################################################### - -config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG) +all: build + +build: build-default-default + +profile: build-profile-default + +clean: clean-default-default + +install: install-default-default + +########################################################### + +build-all-all: build-release-all build-debug-all + +build-release-all: build-release-single build-release-multi build-release-shared + +build-debug-all: build-debug-single build-debug-multi build-debug-shared + +build-profile-all: build-profile-single build-profile-multi build-profile-shared + +build-all-single: build-release-single build-debug-single + +build-all-multi: build-release-multi build-debug-multi + +build-all-shared: build-release-shared build-debug-shared + +################################################### + +install-all-all: install-release-all install-debug-all + +install-release-all: install-release-single install-release-multi install-release-shared + +install-debug-all: install-debug-single install-debug-multi install-debug-shared + +install-profile-all: install-profile-single install-profile-multi install-profile-shared + +install-all-single: install-release-single install-debug-single + +install-all-multi: install-release-multi install-debug-multi + +install-all-shared: install-release-shared install-debug-shared + +################################################### + +clean-all-all: clean-release-all clean-debug-all + +clean-release-all: clean-release-single clean-release-multi clean-release-shared + +clean-debug-all: clean-debug-single clean-debug-multi clean-debug-shared + +clean-profile-all: clean-profile-single clean-profile-multi clean-profile-shared + +clean-all-single: clean-release-single clean-debug-single + +clean-all-multi: clean-release-multi clean-debug-multi + +clean-all-shared: clean-release-shared clean-debug-shared + +########################################################### + +build-release-single: config + $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=single _build_ + +build-debug-single: config + $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _build_ + +build-profile-single: config + $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=single PROFILE=1 _build_ + +build-release-multi: config + $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _build_ + +build-debug-multi: config + $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _build_ + +build-profile-multi: config + $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=multi THREADED=1 PROFILE=1 _build_ + +build-release-shared: config + $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _build_ + +build-debug-shared: config + $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _build_ + +build-profile-shared: config + $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=shared SHARED=1 PROFILE=1 _build_ + +########################################################### + +install-release-single: config + $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=single _install_ + +install-debug-single: config + $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _install_ + +install-profile-single: config + $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=single PROFILE=1 _install_ + +install-release-multi: config + $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _install_ + +install-debug-multi: config + $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _install_ + +install-profile-multi: config + $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=multi THREADED=1 PROFILE=1 _install_ + +install-release-shared: config + $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _install_ + +install-debug-shared: config + $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _install_ + +install-profile-shared: config + $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=shared SHARED=1 PROFILE=1 _install_ + +########################################################### + +clean-release-single: config + $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=single _clean_ + +clean-debug-single: config + $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _clean_ + +clean-profile-single: config + $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=single PROFILE=1 _clean_ + +clean-release-multi: config + $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _clean_ + +clean-debug-multi: config + $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _clean_ + +clean-profile-multi: config + $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=multi THREADED=1 PROFILE=1 _clean_ + +clean-release-shared: config + $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _clean_ + +clean-debug-shared: config + $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _clean_ + +clean-profile-shared: config + $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=shared SHARED=1 PROFILE=1 _clean_ + +########################################################### + +config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG) -- cgit v1.2.1