diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2005-03-12 04:56:36 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2005-03-12 04:56:36 +0000 |
| commit | 42a820099a1c03b6f0a84e4f16cb983c69309aa5 (patch) | |
| tree | c466e6d1fb56662f5dadcb4cc7f24605ffdcefae /externals/grill/flext/buildsys | |
| parent | 27da08004c5f024a0f35e3cb4c2b3942548ebcfa (diff) | |
macros for 64-bit architectures
fixes for icc@linux
fixes for attribute editor (to deal with large dialogs)
fix lines on box text change
fix for gcc strangeness
no more static assignment of symbols (problems with Metrowerks)
fixed bugs in SIMD code for non-power-of-2 lengths
fixed shared library versioning
lock-free thread management
don't depend on ldconfig begin in the system path (should be in /sbin/..)
fixed flext::Timer::At method
new lock-free lifo and fifo
svn path=/trunk/; revision=2619
Diffstat (limited to 'externals/grill/flext/buildsys')
4 files changed, 13 insertions, 2 deletions
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc index 93db3313..3a84d399 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc @@ -61,6 +61,6 @@ $(FLEXTLIBINST): _install_: $(FLEXTINC) $(FLEXTLIBINST) install $(TARGET) $(FLEXTLIBINST) ifdef SHARED - ldconfig -l $(TARGET) + /sbin/ldconfig -l $(TARGET) endif install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc index 4ce1c1da..58bb7c3d 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc @@ -1,5 +1,7 @@ # build class specific settings +TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT) + INCPATH += -I$(FLEXTINC) LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB) LIBS += -l$(FLEXTNAME) diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc index ed06f9cf..8c106e7c 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc @@ -1,5 +1,12 @@ # build class specific settings +ifdef SHARED +SONAME=$(OUTNAME).$(EXT) +TARGET=$(TARGETPATH)/$(OUTNAME).$(PKGVERSION).$(EXT) +else +TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT) +endif + ############################################## # default target @@ -53,4 +60,7 @@ $(FLEXTLIBINST): _install_: $(FLEXTINC) $(FLEXTLIBINST) install $(TARGET) $(FLEXTLIBINST) +ifdef SHARED + /sbin/ldconfig -l $(TARGET) +endif install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc index 2797e882..96d3d642 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc @@ -2,7 +2,6 @@ OBJPATH=$(OUTPATH)/$(OUTSUB) TARGETPATH=$(OBJPATH) -TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT) ############################################## |