Author: matt
Date: 2008-02-26 07:26:08 -0800 (Tue, 26 Feb 2008)
New Revision: 6051
Log:
STR 1883: Attempt to fix installation of binaries in .app bundle on platforms
other than OS X. Must be tested with Cygwin and on Linux!
Modified:
branches/branch-1.1/configure.in
branches/branch-1.1/fluid/Makefile
branches/branch-1.1/makeinclude.in
branches/branch-1.1/test/Makefile
Modified: branches/branch-1.1/configure.in
===================================================================
--- branches/branch-1.1/configure.in 2008-02-26 15:04:03 UTC (rev 6050)
+++ branches/branch-1.1/configure.in 2008-02-26 15:26:08 UTC (rev 6051)
@@ -600,6 +600,7 @@
dnl Define OS-specific stuff...
HLINKS=
POSTBUILD=:
+OSX_ONLY=:
THREADS=
AC_ARG_WITH(links, [ --with-links make header links for common
misspellings])
@@ -680,6 +681,9 @@
# Add a postbuild step after linking applications
POSTBUILD="/Developer/Tools/Rez -t APPL -o"
+ # Some steps are only done for OS X package management
+ OSX_ONLY=
+
# Install/Uninstall FLUID application
INSTALL_DESKTOP="install-osx"
UNINSTALL_DESKTOP="uninstall-osx"
@@ -815,6 +819,7 @@
AC_SUBST(GLLIB)
AC_SUBST(HLINKS)
AC_SUBST(POSTBUILD)
+AC_SUBST(OSX_ONLY)
AC_SUBST(THREADS)
AC_SUBST(INSTALL_DESKTOP)
Modified: branches/branch-1.1/fluid/Makefile
===================================================================
--- branches/branch-1.1/fluid/Makefile 2008-02-26 15:04:03 UTC (rev 6050)
+++ branches/branch-1.1/fluid/Makefile 2008-02-26 15:26:08 UTC (rev 6051)
@@ -58,7 +58,7 @@
../lib/$(IMGLIBNAME)
echo Linking [EMAIL PROTECTED]
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS)
$(LINKFLTKIMG) $(LDLIBS)
- $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+ $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
$(POSTBUILD) $@ ../FL/mac.r
fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
@@ -70,7 +70,7 @@
clean:
-$(RM) *.o core.* *~ *.bck *.bck
-$(RM) core fluid$(EXEEXT) fluid-shared$(EXEEXT)
- -$(RM) fluid.app/Contents/MacOS/fluid
+ -$(RM) fluid.app/Contents/MacOS/fluid$(EXEEXT)
depend: $(CPPFILES)
makedepend -Y -I.. -f makedepend $(CPPFILES)
Modified: branches/branch-1.1/makeinclude.in
===================================================================
--- branches/branch-1.1/makeinclude.in 2008-02-26 15:04:03 UTC (rev 6050)
+++ branches/branch-1.1/makeinclude.in 2008-02-26 15:26:08 UTC (rev 6051)
@@ -100,6 +100,9 @@
# Name of FLUID executable we install
FLUID = @[EMAIL PROTECTED](EXEEXT)
+# Possible steps for OS X build only
+OSX_ONLY = @OSX_ONLY@
+
# Possible steps after linking...
POSTBUILD = @POSTBUILD@
Modified: branches/branch-1.1/test/Makefile
===================================================================
--- branches/branch-1.1/test/Makefile 2008-02-26 15:04:03 UTC (rev 6050)
+++ branches/branch-1.1/test/Makefile 2008-02-26 15:26:08 UTC (rev 6051)
@@ -185,9 +185,9 @@
$(RM) resize.cxx
$(RM) tabs.cxx
$(RM) valuators.cxx
- $(RM) blocks.app/Contents/MacOS/blocks
- $(RM) checkers.app/Contents/MacOS/checkers
- $(RM) sudoku.app/Contents/MacOS/sudoku
+ $(OSX_ONLY) $(RM) blocks.app/Contents/MacOS/blocks$(EXEEXT)
+ $(OSX_ONLY) $(RM) checkers.app/Contents/MacOS/checkers$(EXEEXT)
+ $(OSX_ONLY) $(RM) sudoku.app/Contents/MacOS/sudoku$(EXEEXT)
install: all
echo "Installing example programs to $(DESTDIR)$(docdir)/examples..."
@@ -277,13 +277,13 @@
blocks$(EXEEXT): blocks.o
echo Linking [EMAIL PROTECTED]
$(CXX) $(ARCHFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK)
$(LDLIBS)
- $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
+ $(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
$(POSTBUILD) $@ ../FL/mac.r
checkers$(EXEEXT): checkers.o
echo Linking [EMAIL PROTECTED]
$(CXX) $(ARCHFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
- $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
+ $(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
$(POSTBUILD) $@ ../FL/mac.r
clock$(EXEEXT): clock.o
@@ -409,7 +409,7 @@
sudoku: sudoku.o
echo Linking [EMAIL PROTECTED]
$(CXX) $(ARCHFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS)
$(LINKFLTKIMG) $(LDLIBS)
- $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
+ $(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
$(POSTBUILD) $@ ../FL/mac.r
sudoku.exe: sudoku.o sudoku.rc
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
