diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-02-09 14:39:42 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-02-09 14:39:42 +0000 |
| commit | 52ae3582a2c7bb437df33c0a30bfd5a01d6c5282 (patch) | |
| tree | 4f532a97ab0a6a1c2f96454290bc8803ee022f1f /CMake | |
| parent | 30dad6a4aa2b94fe91783160c86abc75f9dc9e23 (diff) | |
Replace "WIN32" with "_WIN32" or "Windows".
Replace compiler/preprocessor/platform macro "WIN32" with "_WIN32".
Replace "WIN32" in text and documentation with "Windows".
Replace "MSWindows" with "Windows".
To do: README.Windows.txt (and maybe other documentation as well)
needs updates.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12655 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/setup.cmake | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/CMake/setup.cmake b/CMake/setup.cmake index fd70d44d8..bed59722e 100644 --- a/CMake/setup.cmake +++ b/CMake/setup.cmake @@ -73,20 +73,6 @@ set(FLTK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc CACHE PATH # platform dependent information ####################################################################### -# I think this code is useless, so I disabled it by commenting it out. -# Let's wait and see if it does any harm (user complaints). -# The real fix is below: add_definitions(-DWIN32). -# AlbrechtS, Dec 28, 2017. -# fix no WIN32 defined issue -# if(NOT WIN32) -# if(_WIN32) -# set(WIN32 _WIN32) -# elseif(__WIN32__) -# set(WIN32 __WIN32__) -# endif(_WIN32) -# endif(NOT WIN32) -# End of code commented out on Dec 28, 2017 - # set where config files go if(WIN32 AND NOT CYGWIN) set(FLTK_CONFIG_PATH CMake) @@ -124,13 +110,13 @@ if(APPLE) endif(APPLE) if(WIN32) - add_definitions(-DWIN32) + # we do no longer define WIN32 or _WIN32 (since FLTK 1.4.0) + # ... but if we did, we'd define _WIN32 (since FLTK 1.4.0) + # add_definitions(-D_WIN32) if(MSVC) add_definitions(-DWIN32_LEAN_AND_MEAN) add_definitions(-D_CRT_SECURE_NO_WARNINGS) -######## from ide/VisualC2010/config.h set(BORDER_WIDTH 2) -######## endif(MSVC) if(CMAKE_C_COMPILER_ID STREQUAL GNU) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-subsystem,windows") |