Fixes for icon path and Windows includes.

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()

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)