From 0709ac9fabf4184675df1c3d8e205a2790adaadb Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 8 Jan 2005 04:58:31 +0000 Subject: minor updates adapted the queue stuff to work with the new set_callback functionality reconsidered flext::buffer:Update added object construction and destruction flags updated autoconf system small updates better templates, some minor changes update for linux cleanups svn path=/trunk/; revision=2476 --- externals/grill/flext/buildsys/nmake.mak | 2 +- externals/grill/flext/buildsys/win/nmake-msvc-ext.inc | 5 ++--- .../grill/flext/buildsys/win/nmake-msvc-flext.inc | 18 ++++++------------ 3 files changed, 9 insertions(+), 16 deletions(-) (limited to 'externals/grill/flext/buildsys') diff --git a/externals/grill/flext/buildsys/nmake.mak b/externals/grill/flext/buildsys/nmake.mak index 5772d5a9..e097e048 100644 --- a/externals/grill/flext/buildsys/nmake.mak +++ b/externals/grill/flext/buildsys/nmake.mak @@ -46,7 +46,7 @@ BUILDTYPE=single SYSCONFIG=$(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def -OPTIONS=-f $(BUILDPATH)nmake-sub.mak \ +OPTIONS=/NOLOGO /f $(BUILDPATH)nmake-sub.mak \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS) diff --git a/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc b/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc index 419c3276..2a86155a 100644 --- a/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc +++ b/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc @@ -37,8 +37,7 @@ _clean_: ############################################## -$(INSTPATH): - if not exist $@ mkdir $@ > nul +_install_: + @if not exist $(INSTPATH) mkdir $(INSTPATH) > 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 389533de..36a72f4d 100644 --- a/externals/grill/flext/buildsys/win/nmake-msvc-flext.inc +++ b/externals/grill/flext/buildsys/win/nmake-msvc-flext.inc @@ -44,22 +44,16 @@ FLEXTLIBINST=$(FLEXTSHLIB) 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_: +# create folders + @if not exist $(FLEXTINC) mkdir $(FLEXTINC) > nul + @if not exist $(FLEXTLIB) mkdir $(FLEXTLIB) > nul + @if not exist $(FLEXTLIBINST) mkdir $(FLEXTLIBINST) > nul -_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 + for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(FLEXTINC) > nul -- cgit v1.2.1