summaryrefslogtreecommitdiff
path: root/fluid
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2013-09-21 17:23:09 +0000
committerGreg Ercolano <erco@seriss.com>2013-09-21 17:23:09 +0000
commitbedb7fd6f08ac64a56bcb31387179dcf78d5b682 (patch)
tree2ed631e9c063d686e7dfe003540e917f6b2a5b92 /fluid
parent2082d7e1978952138155be7dce29f20004bd71a5 (diff)
Fixes STR# 2973: collection of Sun compiler fixes to Makefiles.
o Adds $(CXXFLAGS) to $(CXX) commands o Implements older, more backwards compatible Bourne shell test(1) syntax for equality tests (= vs ==) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9981 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
-rw-r--r--fluid/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/fluid/Makefile b/fluid/Makefile
index 6034f0f7f..ec25f35b7 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -48,13 +48,13 @@ all: $(FLUID) fluid$(EXEEXT)
fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
$(IMGLIBNAME)
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
+ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
../src/$(IMGDSONAME)
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
+ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
clean:
-$(RM) *.o core.* *~ *.bck *.bck