diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-03-11 14:38:02 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-03-11 14:38:02 +0100 |
| commit | 8a7d4c9f610824fb203ef63730525dd474f03c34 (patch) | |
| tree | b6460ec759e6250c7ce81e32c5a3c6c188facb89 /test | |
| parent | 55132049c78694cae34d1d17ed20941be86cc965 (diff) | |
Remove CodeWarrior "support"
Metrowerks CodeWarrior was an ancient macOS compiler (discontinued
since 2005) that defined the macro __MWERKS__. Code using this macro
and several comments have been removed.
Diffstat (limited to 'test')
| -rw-r--r-- | test/demo.cxx | 19 | ||||
| -rw-r--r-- | test/editor.cxx | 10 |
2 files changed, 11 insertions, 18 deletions
diff --git a/test/demo.cxx b/test/demo.cxx index ddee12234..b68a66756 100644 --- a/test/demo.cxx +++ b/test/demo.cxx @@ -32,23 +32,20 @@ #include <FL/filename.H> #include <FL/platform.H> -/* Define a macro to decide if a trailing 'd' needs to be removed +/* Define a macro to decide whether a trailing 'd' needs to be removed from the executable file name. Previous versions of Visual Studio added a 'd' to the executable file name ('demod.exe') in Debug configurations that needed to be removed. This is no longer true with CMake-generated IDE's since FLTK 1.4. - The 'old' behavior obviously applied or still applies to - CodeWarrior (__MWERKS__). - *FIXME* is this still true and necessary? + Just in case we add it again: leave macro DEBUG_EXE_WITH_D defined + and leave the code using this macro as-is. */ -// #if ( defined _MSC_VER || defined __MWERKS__ ) && defined _DEBUG - -#if defined(_WIN32) && defined(__MWERKS__) && defined(_DEBUG) -# define DEBUG_EXE_WITH_D 1 -#else +// #if defined(_MSC_VER) && defined(_DEBUG) // Visual Studio in Debug mode +// # define DEBUG_EXE_WITH_D 1 +// #else # define DEBUG_EXE_WITH_D 0 -#endif +// #endif /* The form description */ @@ -446,7 +443,7 @@ int main(int argc, char **argv) { char buf[FL_PATH_MAX]; strcpy(buf, argv[0]); #if DEBUG_EXE_WITH_D - // MS_VisualC appends a 'd' to debugging executables. Remove it. + // MS_Visual Studio appends a 'd' to debugging executables. Remove it. fl_filename_setext( buf, "" ); buf[ strlen(buf)-1 ] = 0; #endif diff --git a/test/editor.cxx b/test/editor.cxx index 1a67fc7d6..176a8d79b 100644 --- a/test/editor.cxx +++ b/test/editor.cxx @@ -5,17 +5,17 @@ // // This program is described in Chapter 4 of the FLTK Programmer's Guide. // -// Copyright 1998-2018 by Bill Spitzak and others. +// Copyright 1998-2020 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 // file is missing or damaged, see the license at: // -// http://www.fltk.org/COPYING.php +// https://www.fltk.org/COPYING.php // // Please report all bugs and problems on the following page: // -// http://www.fltk.org/str.php +// https://www.fltk.org/str.php // // @@ -28,10 +28,6 @@ #include <ctype.h> #include <errno.h> -#ifdef __MWERKS__ -# define FL_DLL -#endif - #include <FL/Fl.H> #include <FL/platform.H> // for fl_open_callback #include <FL/Fl_Group.H> |