diff options
| author | Matthias Melcher <github@matthiasm.com> | 2025-03-07 16:46:39 +0100 |
|---|---|---|
| committer | Matthias Melcher <github@matthiasm.com> | 2025-03-07 16:46:39 +0100 |
| commit | d449a3d9bf3cf422a84db1c952b07be48d1591a8 (patch) | |
| tree | d26c1136cadeede6ffe8347458e13566695c050e /fluid | |
| parent | 1985aefc0e502048f92b91beef87c0dfbe669fed (diff) | |
Fixes for icon path and Windows includes.
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | fluid/tools/ExternalCodeEditor_WIN32.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt index c0a398d5f..4e53bd406 100644 --- a/fluid/CMakeLists.txt +++ b/fluid/CMakeLists.txt @@ -129,7 +129,7 @@ if(APPLE AND NOT FLTK_BACKEND_X11) # macOS set(ICON_NAME fluid.icns) - set(ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../icons/${ICON_NAME}") + set(ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_NAME}") add_executable(fluid MACOSX_BUNDLE main.cxx main.h ${ICON_PATH}) # create macOS bundle wrapper script @@ -221,8 +221,8 @@ if(UNIX) # Install desktop icons foreach(icon 32 48 64 128) - install(FILES ../icons/fluid-${icon}.png - DESTINATION ${FLTK_DATADIR}/../icons/hicolor/${icon}x${icon}/apps + install(FILES icons/fluid-${icon}.png + DESTINATION ${FLTK_DATADIR}/icons/hicolor/${icon}x${icon}/apps RENAME fluid.png ) endforeach() diff --git a/fluid/tools/ExternalCodeEditor_WIN32.h b/fluid/tools/ExternalCodeEditor_WIN32.h index de4c2c4a7..97d93e495 100644 --- a/fluid/tools/ExternalCodeEditor_WIN32.h +++ b/fluid/tools/ExternalCodeEditor_WIN32.h @@ -7,6 +7,8 @@ #ifndef _EXTCODEEDITOR_H #define _EXTCODEEDITOR_H +#include <FL/Fl.H> + /* We require at least Windows 2000 (WINVER == 0x0500) for GetFileSizeEx(). */ /* This must be defined before #include <windows.h> - MinGW doesn't do that. */ #if !defined(WINVER) || (WINVER < 0x0500) |