summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2015-12-29 16:41:15 +0000
committerManolo Gouy <Manolo>2015-12-29 16:41:15 +0000
commit8ac33d6b717c9c2cf93d7bd6d64148d242a58b36 (patch)
tree51e446a6c5f24896ad409b42b321f09bf9f49132
parentfdd1369292bff16c617b45afad8b4f874d4e3b0b (diff)
Mac OS: Enhanced the application bundle for the editor demo
so it is launchable by dropping any file on its icon. This is done both for the configure/make and the CMake build systems (the Xcode build system did that already). The editor demo is the only one calling fl_open_callback(). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10981 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CMake/macros.cmake3
-rw-r--r--ide/Xcode4/plists/editor-Info.plist2
-rw-r--r--test/Makefile1
3 files changed, 5 insertions, 1 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index b2015123d..49ec49d21 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -132,6 +132,9 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
endif(NOT ${tname} STREQUAL "demo")
set_target_properties(${tname} PROPERTIES RESOURCE ${RESOURCE_PATH})
endif(APPLE AND DEFINED RESOURCE_PATH)
+ if(${tname} STREQUAL "editor")
+ set_target_properties("editor" PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/ide/Xcode4/plists/editor-Info.plist" )
+ endif(${tname} STREQUAL "editor")
target_link_libraries(${tname} ${LIBRARIES})
diff --git a/ide/Xcode4/plists/editor-Info.plist b/ide/Xcode4/plists/editor-Info.plist
index 422e9915c..dea3f13f5 100644
--- a/ide/Xcode4/plists/editor-Info.plist
+++ b/ide/Xcode4/plists/editor-Info.plist
@@ -22,7 +22,7 @@
</dict>
</array>
<key>CFBundleExecutable</key>
- <string>${EXECUTABLE_NAME}</string>
+ <string>editor</string>
<key>CFBundleGetInfoString</key>
<string>Part of the FLTK library. Please visit www.fltk.org.</string>
<key>CFBundleIdentifier</key>
diff --git a/test/Makefile b/test/Makefile
index f7e7333cb..3f55f89de 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -342,6 +342,7 @@ editor$(EXEEXT): editor.o
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
$(OSX_ONLY) ../fltk-config --post $@
+ $(OSX_ONLY) cp -f ../ide/Xcode4/plists/editor-Info.plist editor.app/Contents/Info.plist
fast_slow$(EXEEXT): fast_slow.o
fast_slow.cxx: fast_slow.fl ../fluid/fluid$(EXEEXT)