diff --git a/code/client/cl_scrn.cpp b/code/client/cl_scrn.cpp index a0d038d..68d9c8f 100644 --- a/code/client/cl_scrn.cpp +++ b/code/client/cl_scrn.cpp @@ -386,7 +386,7 @@ static intStats_t usecGPU; static void SCR_PerformanceCounters() { - qbool Sys_V_IsVSynced(); + extern qbool Sys_V_IsVSynced(); float x, y, cw = 8, ch = 12; SCR_AdjustFrom640( 0, 0, &cw, &ch ); diff --git a/makefiles/linux_gmake/botlib.make b/makefiles/linux_gmake/botlib.make index 9569119..d3944b8 100644 --- a/makefiles/linux_gmake/botlib.make +++ b/makefiles/linux_gmake/botlib.make @@ -19,7 +19,7 @@ ifeq ($(config),debug_x64) INCLUDES += FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse -std=c++98 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += @@ -46,7 +46,7 @@ ifeq ($(config),release_x64) INCLUDES += FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse -g1 -std=c++98 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -g1 -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += diff --git a/makefiles/linux_gmake/cnq3-server.make b/makefiles/linux_gmake/cnq3-server.make index 1818cb6..802d99a 100644 --- a/makefiles/linux_gmake/cnq3-server.make +++ b/makefiles/linux_gmake/cnq3-server.make @@ -19,7 +19,7 @@ ifeq ($(config),debug_x64) INCLUDES += FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse -x c++ -std=c++98 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -x c++ -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += ../../.build/debug_x64/libbotlib.a -ldl -lm @@ -50,7 +50,7 @@ ifeq ($(config),release_x64) INCLUDES += FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse -g1 -x c++ -std=c++98 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -g1 -x c++ -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += ../../.build/release_x64/libbotlib.a -ldl -lm diff --git a/makefiles/linux_gmake/cnq3.make b/makefiles/linux_gmake/cnq3.make index 65d0826..bc7a087 100644 --- a/makefiles/linux_gmake/cnq3.make +++ b/makefiles/linux_gmake/cnq3.make @@ -19,7 +19,7 @@ ifeq ($(config),debug_x64) INCLUDES += -I../../code/glew/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse -x c++ -std=c++98 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -x c++ -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += ../../.build/debug_x64/libbotlib.a ../../.build/debug_x64/librenderer.a ../../.build/debug_x64/libglew.a ../../.build/debug_x64/liblibjpeg-turbo.a -ldl -lm -lSDL2 -lGL @@ -50,7 +50,7 @@ ifeq ($(config),release_x64) INCLUDES += -I../../code/glew/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse -g1 -x c++ -std=c++98 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -g1 -x c++ -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += ../../.build/release_x64/libbotlib.a ../../.build/release_x64/librenderer.a ../../.build/release_x64/libglew.a ../../.build/release_x64/liblibjpeg-turbo.a -ldl -lm -lSDL2 -lGL diff --git a/makefiles/linux_gmake/glew.make b/makefiles/linux_gmake/glew.make index 014d2b2..ca46ce6 100644 --- a/makefiles/linux_gmake/glew.make +++ b/makefiles/linux_gmake/glew.make @@ -19,7 +19,7 @@ ifeq ($(config),debug_x64) INCLUDES += -I../../code/glew/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += @@ -46,7 +46,7 @@ ifeq ($(config),release_x64) INCLUDES += -I../../code/glew/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse -g1 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -g1 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += diff --git a/makefiles/linux_gmake/libjpeg-turbo.make b/makefiles/linux_gmake/libjpeg-turbo.make index 383d7b1..6d9e9d1 100644 --- a/makefiles/linux_gmake/libjpeg-turbo.make +++ b/makefiles/linux_gmake/libjpeg-turbo.make @@ -19,7 +19,7 @@ ifeq ($(config),debug_x64) INCLUDES += -I../../code/libjpeg-turbo -I../../code/libjpeg-turbo/simd FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += @@ -46,7 +46,7 @@ ifeq ($(config),release_x64) INCLUDES += -I../../code/libjpeg-turbo -I../../code/libjpeg-turbo/simd FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse -g1 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -g1 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += diff --git a/makefiles/linux_gmake/renderer.make b/makefiles/linux_gmake/renderer.make index 6655d31..960adde 100644 --- a/makefiles/linux_gmake/renderer.make +++ b/makefiles/linux_gmake/renderer.make @@ -19,7 +19,7 @@ ifeq ($(config),debug_x64) INCLUDES += -I../../code/glew/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse -std=c++98 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += @@ -46,7 +46,7 @@ ifeq ($(config),release_x64) INCLUDES += -I../../code/glew/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -Wno-vexing-parse -g1 -std=c++98 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fomit-frame-pointer -ffast-math -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -g1 -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += diff --git a/makefiles/premake5.lua b/makefiles/premake5.lua index 0de8b6a..5164653 100644 --- a/makefiles/premake5.lua +++ b/makefiles/premake5.lua @@ -264,7 +264,7 @@ local function ApplyProjectSettings(outputExe) buildoptions { "/wd4267" } -- - -- GCC + -- GCC / Clang -- -- "-g1" is the minimum amount of debug information @@ -277,8 +277,7 @@ local function ApplyProjectSettings(outputExe) "-Wno-unused-parameter", "-Wno-write-strings", "-Wno-parentheses", - "-Wno-parentheses-equality", - "-Wno-vexing-parse" + "-Wno-parentheses-equality" } linkoptions { "" }