summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2008-02-26 15:26:08 +0000
committerMatthias Melcher <fltk@matthiasm.com>2008-02-26 15:26:08 +0000
commit9c538a4b2e4b349785b77e774a1011380d8b46cb (patch)
tree76c02ee0161c3aa07e95b391b24f7186dd4e0186 /test
parent68a20dbc3205eada2a582859d3cb504a5c39f95c (diff)
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!
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6051 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'test')
-rw-r--r--test/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/Makefile b/test/Makefile
index abd0a8a34..75841e024 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -185,9 +185,9 @@ clean:
$(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 @@ buttons$(EXEEXT): buttons.o
blocks$(EXEEXT): blocks.o
echo Linking $@...
$(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 $@...
$(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 @@ subwindow$(EXEEXT): subwindow.o
sudoku: sudoku.o
echo Linking $@...
$(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