Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-31 13:55:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix CMake build (fluid) on case sensitive macOS file systems.

Browse Source 
Note: Xcode projects NOT modified. These project files appear to refer
to 'fluid/Fluid.app' (with uppercase 'F') as well.
This commit is contained in:
Albrecht Schlosser
2018-12-04 15:00:49 +01:00
parent 9cd69dbad1
commit 3bd78bb022
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -3,6 +3,7 @@ CHANGES IN FLTK 1.3.5 RELEASED: ??? ?? 2018
Bug fixes and other improvements Bug fixes and other improvements
- Fixed CMake build (fluid) on case sensitive macOS file systems.
- Windows/OpenGL: improved pixel format detection (STR #3119). - Windows/OpenGL: improved pixel format detection (STR #3119).
- Added support for MacOS 10.14 "Mojave": all drawing to windows is done - Added support for MacOS 10.14 "Mojave": all drawing to windows is done
through "layer-backed views" when the app is linked to SDK 10.14. through "layer-backed views" when the app is linked to SDK 10.14.
README.OSX.txt
+4 -4
View File
@@ -283,8 +283,8 @@ generate C++ source code from .fl resource files. Add Fluid to the developer
tools: tools:
sudo mkdir /Developer/Applications/Utilities/FLTK/ sudo mkdir /Developer/Applications/Utilities/FLTK/
sudo rm -f -r /Developer/Applications/Utilities/FLTK/Fluid.app sudo rm -f -r /Developer/Applications/Utilities/FLTK/fluid.app
sudo cp -R ide/Xcode4/build/Release/Fluid.app /Developer/Applications/Utilities/FLTK/ sudo cp -R ide/Xcode4/build/Release/fluid.app /Developer/Applications/Utilities/FLTK/
3.8 Installing Little Helpers 3.8 Installing Little Helpers
@@ -442,8 +442,8 @@ generate C++ source code from .fl resource files. Add Fluid to the developer
tools: tools:
sudo mkdir /Applications/FLTK/ sudo mkdir /Applications/FLTK/
sudo rm -f -r /Applications/FLTK/Fluid.app sudo rm -f -r /Applications/FLTK/fluid.app
sudo cp -R (Organizer->Derived Data Path)/Release/Fluid.app /Applications/FLTK/ sudo cp -R (Organizer->Derived Data Path)/Release/fluid.app /Applications/FLTK/
(TODO: 4.8 Installing Little Helpers) (TODO: 4.8 Installing Little Helpers)
(TODO: 4.9 Creating new Projects) (TODO: 4.9 Creating new Projects)
fluid/CMakeLists.txt
+1 -1
View File
@@ -41,7 +41,7 @@ set(CPPFILES
) )
if(APPLE AND NOT OPTION_APPLE_X11) if(APPLE AND NOT OPTION_APPLE_X11)
set(FLUID_ICON "${CMAKE_CURRENT_SOURCE_DIR}/Fluid.app/Contents/Resources/fluid.icns") set(FLUID_ICON "${CMAKE_CURRENT_SOURCE_DIR}/fluid.app/Contents/Resources/fluid.icns")
add_executable(fluid MACOSX_BUNDLE ${CPPFILES} "${FLUID_ICON}") add_executable(fluid MACOSX_BUNDLE ${CPPFILES} "${FLUID_ICON}")
FLTK_SET_BUNDLE_ICON(fluid "${FLUID_ICON}") FLTK_SET_BUNDLE_ICON(fluid "${FLUID_ICON}")
else() else()
test/demo.cxx
+1 -1
View File
@@ -322,7 +322,7 @@ void dobut(Fl_Widget *, long arg)
*arg = 0; *arg = 0;
#if defined USING_XCODE #if defined USING_XCODE
fl_filename_absolute(path, 2048, "../../../../test/"); fl_filename_absolute(path, 2048, "../../../../test/");
fluidpath = "Fluid.app"; fluidpath = "fluid.app";
#else #else
strcpy(path, app_path); strcat(path, "/"); strcpy(path, app_path); strcat(path, "/");
fluidpath = "../fluid/fluid.app"; fluidpath = "../fluid/fluid.app";