Set C++ to 17, and a few CMake fixes for Linux #20
Conversation
CMakeLists.txt
Outdated
| SET(CMAKE_CXX_COMPILER "g++") | ||
| SET(CMAKE_CXX_FLAGS "-O0 -g -Wno-write-strings -Wno-multichar -Wno-address-of-temporary") | ||
| SET(CMAKE_C_FLAGS "-O0 -g") | ||
| SET(CMAKE_CXX_FLAGS "-O0 -g -std=c++14 -Wno-write-strings -Wno-multichar ${BITS} ${EXTRA_CXX_FLAGS}") |
There was a problem hiding this comment.
You need this done like this
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
But there some issues in with CMake compatibility level. Also, as agreed in #4, there should be C++17 standard support.
There was a problem hiding this comment.
Done, plus a few lines of code adapted. And indeed, that is just functional cmake to get the code to compile.
| @@ -14,14 +14,19 @@ PROJECT(Descent3) | |||
| IF (UNIX) | |||
| SET (D3_GAMEDIR "~/Descent3/") | |||
|
|
|||
| IF (APPLE) | |||
There was a problem hiding this comment.
I doubt that in Apple there may 64bit code generated. Also, -m32 should be added via compiler toolchain, not directly in CMake project file.
There was a problem hiding this comment.
Yes, -m32 did not quite work, removed entirely.
|
I'd actually wait to see the outcome of #9 before merging this and similar PRs, given that Ryan Gordon had a much more "modern" port for Linux and macOS, just my 2c. |
`LIST(APPEND ..)` adds a `;` to the gcc command line, replaced with string interpolation. Only use "-Wno-address-of-temporary" on macOS (=clang), on Linux/gcc use "-fpermissive" which still shows the compiler warning so it can be fixed later.
remove register keyword, add cstdint include
th1000s
changed the title
|
Merging, thanks for your contribution ! |
Set C++ to 17, and a few CMake fixes for Linux
No description provided.