From bedb7fd6f08ac64a56bcb31387179dcf78d5b682 Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Sat, 21 Sep 2013 17:23:09 +0000 Subject: 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 --- fluid/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fluid') 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 -- cgit v1.2.3