From 8838e976a0b87279e5a98e560ed3d6ef20dc9139 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Mon, 10 Mar 2025 15:43:12 +0100 Subject: More (mostly) documentation updates for FLTK 1.5.0 All files: remove autoconf/configure related stuff, update links. - README.txt: describe prerequisites, provide generic instructions on how to use CMake to build FLTK - test/demo.cxx: remove code used for configure/make build - test/CMakeLists.txt: remove obsolete 'target_compile_definitions()' --- test/CMakeLists.txt | 2 -- test/demo.cxx | 10 +--------- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'test') diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d2e1c9c5f..a445b05fa 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -352,5 +352,3 @@ file(COPY # The main test program 'demo' needs additional hints and configurations. # Note: CMake defines "CMAKE_INTDIR" which is the build type folder (e.g. "Debug") # for multi config builds (MSVC, Xcode) - -target_compile_definitions (demo PRIVATE GENERATED_BY_CMAKE) diff --git a/test/demo.cxx b/test/demo.cxx index a96097653..789fde76d 100644 --- a/test/demo.cxx +++ b/test/demo.cxx @@ -1,7 +1,7 @@ // // Main demo program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2023 by Bill Spitzak and others. +// Copyright 1998-2025 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -549,7 +549,6 @@ int main(int argc, char **argv) { fix_path(app_path); // fluid's path is relative to app_path: - // - "../fluid" for autoconf/make builds // - ".." (parent directory) for single configuration CMake builds // - "../../$CMAKE_INTDIR" for multi-config (Visual Studio or Xcode) CMake builds @@ -564,16 +563,11 @@ int main(int argc, char **argv) { fix_path(fluid_path); // remove folder name ("test") fix_path(options_path); -#if !defined(GENERATED_BY_CMAKE) - strcat(fluid_path, "/fluid"); - strcat(options_path, "/fltk-options"); -#else // CMake: potentially Visual Studio or Xcode (multi config) if (cmake_intdir) { strcat(fluid_path, cmake_intdir); // append e.g. "/Debug" strcat(options_path, cmake_intdir); } -#endif // GENERATED_BY_CMAKE // construct data_path for the menu file and all resources (data files) // CMake: replace "/bin/test/*" with "/data" @@ -581,13 +575,11 @@ int main(int argc, char **argv) { strcpy(data_path, app_path); -#if defined(GENERATED_BY_CMAKE) { char *pos = strstr(data_path, "/bin/test"); if (pos) strcpy(pos, "/data"); } -#endif // GENERATED_BY_CMAKE // Construct the menu file name, optionally overridden by command args. // Use data_path and append "/.menu" -- cgit v1.2.3