jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-05-26 13:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70 from Lgt2x/linux-clang

Browse Source 
Fix Linux clang build
This commit is contained in:
Jeod
2024-04-18 14:50:55 -04:00
committed by GitHub
parent 2760c3c3fc c68d6419c9
commit 4f5bd86c1c
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -12,13 +12,12 @@ SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
IF (UNIX)
SET (D3_GAMEDIR "~/Descent3/")
IF (APPLE)
SET(EXTRA_CXX_FLAGS "-Wno-address-of-temporary")
ELSE()
SET(EXTRA_CXX_FLAGS "-fpermissive")
IF (UNIX AND NOT APPLE)
SET(EXTRA_CXX_FLAGS "-fpermissive ")
ENDIF()
STRING(APPEND CMAKE_CXX_FLAGS " -Wno-write-strings -Wno-multichar ${BITS} ${EXTRA_CXX_FLAGS}")
STRING(APPEND CMAKE_CXX_FLAGS " -Wno-write-strings -Wno-multichar -Wno-address-of-temporary ${BITS} ${EXTRA_CXX_FLAGS}")
STRING(APPEND CMAKE_C_FLAGS " ${BITS}")
FIND_PACKAGE(SDL REQUIRED)

2
ui/UIEdit.cpp
View File

@@ -199,7 +199,7 @@ void UIEdit::SetText(char *text) {
void UIEdit::GetText(char *buffer, int len) {
// ASSERT(strlen(m_TextBuf) < (unsigned)len);
if (!m_TextBuf) {
buffer[0] = NULL;
buffer[0] = 0;
return;
}
strncpy(buffer, m_TextBuf, len - 1);