- first attempt to compile on a Mac

This could have gone better, there's far too many warnings here
This commit is contained in:
Christoph Oelckers 2020-01-06 02:41:47 +01:00
parent e45cf19936
commit 134122335b
38 changed files with 122 additions and 89 deletions

View file

@ -228,7 +228,7 @@ if( MSVC )
# Most of these need to be cleaned out. The source is currently infested with far too much conditional compilation which is a constant source of problems. # Most of these need to be cleaned out. The source is currently infested with far too much conditional compilation which is a constant source of problems.
set( ALL_C_FLAGS "${ALL_C_FLAGS} /DRENDERTYPESDL=1 /DMIXERTYPEWIN=1 /DSDL_USEFOLDER /DSDL_TARGET=2 /DUSE_OPENGL=1 /DSTARTUP_WINDOW /DUSE_LIBVPX /DNOASM=1 /DWIN32" ) set( ALL_C_FLAGS "${ALL_C_FLAGS} /DUSE_OPENGL=1 /DUSE_LIBVPX /DNOASM=1 /DWIN32" )
# The CMake configurations set /GR and /MD by default, which conflict with our settings. # The CMake configurations set /GR and /MD by default, which conflict with our settings.
string(REPLACE "/MD " " " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} ) string(REPLACE "/MD " " " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} )
@ -248,6 +248,7 @@ else()
else() else()
set( ALL_C_FLAGS "-ffp-contract=off" ) set( ALL_C_FLAGS "-ffp-contract=off" )
endif() endif()
set( ALL_C_FLAGS "${ALL_C_FLAGS} -DUSE_OPENGL=1 -DNOASM=1" ) # /DUSE_LIBVPX fixme: Set up libvpx
if ( UNIX ) if ( UNIX )
include(CheckSymbolExists) include(CheckSymbolExists)

View file

@ -23,8 +23,11 @@ if( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
endif() endif()
endif() endif()
# Build does not work with signed chars!
if (MSVC) if (MSVC)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" )
else()
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funsigned-char -Wno-missing-braces -Wno-char-subscripts" )
endif() endif()
option( DYN_FLUIDSYNTH "Dynamically load fluidsynth" ON ) option( DYN_FLUIDSYNTH "Dynamically load fluidsynth" ON )
@ -66,12 +69,12 @@ if( WIN32 )
set( DX_dinput8_LIBRARY dinput8 ) set( DX_dinput8_LIBRARY dinput8 )
if( X64 ) if( X64 )
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../platform/Windows/lib/64) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../platform/Windows/lib/64)
else() else()
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../platform/Windows/lib/32) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../platform/Windows/lib/32)
endif() endif()
set( PROJECT_LIBRARIES set( PROJECT_LIBRARIES
opengl32 opengl32
wsock32 wsock32
@ -85,9 +88,9 @@ if( WIN32 )
ws2_32 ws2_32
setupapi setupapi
oleaut32 oleaut32
dbghelp dbghelp
legacy_stdio_definitions legacy_stdio_definitions
shlwapi shlwapi
version version
imm32 imm32
@ -104,11 +107,11 @@ if( WIN32 )
# this local library crap needs to go away. Sadly there doesn't seem to be anything to get a working libvpx that doesn't force linking with MinGW dependencies. # this local library crap needs to go away. Sadly there doesn't seem to be anything to get a working libvpx that doesn't force linking with MinGW dependencies.
libvpx libvpx
libcompat-to-msvc libcompat-to-msvc
)
)
if( NOT DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) if( NOT DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} DelayImp ) set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} DelayImp )
@ -367,12 +370,12 @@ endif()
# Check for thread_local keyword, it's optional at the moment # Check for thread_local keyword, it's optional at the moment
CHECK_CXX_SOURCE_COMPILES("thread_local int i; int main() { i = 0; }" #CHECK_CXX_SOURCE_COMPILES("thread_local int i; int main() { i = 0; }"
HAVE_THREAD_LOCAL) # HAVE_THREAD_LOCAL)
if( NOT HAVE_THREAD_LOCAL ) #if( NOT HAVE_THREAD_LOCAL )
message( SEND_ERROR "C++ compiler doesn't support thread_local storage duration specifier" ) # message( SEND_ERROR "C++ compiler doesn't support thread_local storage duration specifier" )
endif() #endif()
# Check for functions that may or may not exist. # Check for functions that may or may not exist.
@ -560,7 +563,7 @@ endif()
add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h
COMMAND re2c --no-generation-date -s -o ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h ${CMAKE_CURRENT_SOURCE_DIR}/common/utility/sc_man_scanner.re COMMAND re2c --no-generation-date -s -o ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h ${CMAKE_CURRENT_SOURCE_DIR}/common/utility/sc_man_scanner.re
DEPENDS re2c ${CMAKE_CURRENT_SOURCE_DIR}/common/utility/sc_man_scanner.re ) DEPENDS re2c ${CMAKE_CURRENT_SOURCE_DIR}/common/utility/sc_man_scanner.re )
include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
@ -657,7 +660,7 @@ set( FASTMATH_SOURCES
# The rest is only here because it is C, not C++ # The rest is only here because it is C, not C++
common/utility/strnatcmp.c common/utility/strnatcmp.c
common/rendering/gl_load/gl_load.c common/rendering/gl_load/gl_load.c
gitinfo.cpp gitinfo.cpp
) )
@ -671,7 +674,7 @@ set (PCH_SOURCES
glbackend/gl_palmanager.cpp glbackend/gl_palmanager.cpp
glbackend/gl_texture.cpp glbackend/gl_texture.cpp
glbackend/hw_draw2d.cpp glbackend/hw_draw2d.cpp
thirdparty/src/base64.cpp thirdparty/src/base64.cpp
thirdparty/src/sjson.cpp thirdparty/src/sjson.cpp
thirdparty/src/fix16.cpp thirdparty/src/fix16.cpp
@ -684,7 +687,7 @@ set (PCH_SOURCES
#thirdparty/imgui/imgui_impl_opengl3.cpp #thirdparty/imgui/imgui_impl_opengl3.cpp
#thirdparty/imgui/imgui_impl_sdl.cpp #thirdparty/imgui/imgui_impl_sdl.cpp
#thirdparty/imgui/imgui_widgets.cpp #thirdparty/imgui/imgui_widgets.cpp
# Todo: Split out the license-safe code from this. # Todo: Split out the license-safe code from this.
build/src/a-c.cpp build/src/a-c.cpp
build/src/animvpx.cpp build/src/animvpx.cpp
@ -707,7 +710,7 @@ set (PCH_SOURCES
build/src/tiles.cpp build/src/tiles.cpp
build/src/timer.cpp build/src/timer.cpp
build/src/voxmodel.cpp build/src/voxmodel.cpp
common/animlib.cpp common/animlib.cpp
common/rts.cpp common/rts.cpp
common/gameconfigfile.cpp common/gameconfigfile.cpp
@ -728,14 +731,14 @@ set (PCH_SOURCES
common/2d/v_draw.cpp common/2d/v_draw.cpp
common/2d/v_drawtext.cpp common/2d/v_drawtext.cpp
common/2d/renderstyle.cpp common/2d/renderstyle.cpp
common/fonts/font.cpp common/fonts/font.cpp
common/fonts/hexfont.cpp common/fonts/hexfont.cpp
common/fonts/singlelumpfont.cpp common/fonts/singlelumpfont.cpp
common/fonts/v_font.cpp common/fonts/v_font.cpp
common/fonts/v_text.cpp common/fonts/v_text.cpp
common/fonts/fontchars.cpp common/fonts/fontchars.cpp
common/console/c_cvars.cpp common/console/c_cvars.cpp
common/console/c_console.cpp common/console/c_console.cpp
common/console/c_consolebuffer.cpp common/console/c_consolebuffer.cpp
@ -745,7 +748,7 @@ set (PCH_SOURCES
common/console/c_dispatch.cpp common/console/c_dispatch.cpp
common/console/d_event.cpp common/console/d_event.cpp
common/console/c_con.cpp common/console/c_con.cpp
common/utility/i_time.cpp common/utility/i_time.cpp
common/utility/name.cpp common/utility/name.cpp
common/utility/cmdlib.cpp common/utility/cmdlib.cpp
@ -795,12 +798,12 @@ set (PCH_SOURCES
common/music/music_config.cpp common/music/music_config.cpp
common/music/music_midi_base.cpp common/music/music_midi_base.cpp
common/music/s_advsound.cpp common/music/s_advsound.cpp
common/sound/backend/oalsound.cpp common/sound/backend/oalsound.cpp
common/sound/backend/i_sound.cpp common/sound/backend/i_sound.cpp
common/sound/s_sound.cpp common/sound/s_sound.cpp
common/sound/s_environment.cpp common/sound/s_environment.cpp
common/menu/imagescroller.cpp common/menu/imagescroller.cpp
common/menu/joystickmenu.cpp common/menu/joystickmenu.cpp
common/menu/listmenu.cpp common/menu/listmenu.cpp
@ -812,11 +815,11 @@ set (PCH_SOURCES
common/menu/messagebox.cpp common/menu/messagebox.cpp
common/menu/optionmenu.cpp common/menu/optionmenu.cpp
common/menu/resolutionmenu.cpp common/menu/resolutionmenu.cpp
#common/input/i_joystick.cpp #common/input/i_joystick.cpp
#common/input/i_input.cpp #common/input/i_input.cpp
common/input/m_joy.cpp common/input/m_joy.cpp
common/rendering/r_videoscale.cpp common/rendering/r_videoscale.cpp
common/rendering/v_framebuffer.cpp common/rendering/v_framebuffer.cpp
common/rendering/v_video.cpp common/rendering/v_video.cpp
@ -908,7 +911,7 @@ include_directories(
${CMAKE_BINARY_DIR}/libraries/gdtoa ${CMAKE_BINARY_DIR}/libraries/gdtoa
#${SYSTEM_SOURCES_DIR} #${SYSTEM_SOURCES_DIR}
) )
add_dependencies( ${PROJECT_NAME} revision_check ) add_dependencies( ${PROJECT_NAME} revision_check )

View file

@ -1,7 +1,13 @@
cmake_minimum_required( VERSION 3.1.0 ) cmake_minimum_required( VERSION 3.1.0 )
require_stricmp()
require_strnicmp()
# Build does not work with signed chars!
if (MSVC) if (MSVC)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" )
else()
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funsigned-char -Wno-missing-braces -Wno-char-subscripts" )
endif() endif()
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../../build/include" ) include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../../build/include" )
@ -13,6 +19,7 @@ include_directories( "${ZLIB_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${BZIP2_INCL
endif() endif()
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../build/include ${CMAKE_CURRENT_SOURCE_DIR}/../build/include
${CMAKE_CURRENT_SOURCE_DIR}/../audiolib/include ${CMAKE_CURRENT_SOURCE_DIR}/../audiolib/include
${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include ${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include

View file

@ -6904,7 +6904,7 @@ void actFireVector(spritetype *pShooter, int a2, int a3, int a4, int a5, int a6,
int y = gHitInfo.hity-mulscale(a5, 16, 14); int y = gHitInfo.hity-mulscale(a5, 16, 14);
int z = gHitInfo.hitz-mulscale(a6, 256, 14); int z = gHitInfo.hitz-mulscale(a6, 256, 14);
short nSector = gHitInfo.hitsect; short nSector = gHitInfo.hitsect;
char nSurf = kSurfNone; unsigned char nSurf = kSurfNone;
if (nRange == 0 || approxDist(gHitInfo.hitx-pShooter->x, gHitInfo.hity-pShooter->y) < nRange) if (nRange == 0 || approxDist(gHitInfo.hitx-pShooter->x, gHitInfo.hity-pShooter->y) < nRange)
{ {
switch (hit) switch (hit)

View file

@ -1987,7 +1987,7 @@ bool genDudePrepare(spritetype* pSprite, int propId) {
pSprite->clipdist = ClipRange((pSprite->xrepeat + pSprite->yrepeat) >> 1, 4, 120); pSprite->clipdist = ClipRange((pSprite->xrepeat + pSprite->yrepeat) >> 1, 4, 120);
if (propId) break; if (propId) break;
fallthrough__; break;
} }
} }

View file

@ -35,8 +35,8 @@ BEGIN_BLD_NS
#pragma pack(push, 1) #pragma pack(push, 1)
struct GAMEOPTIONS { struct GAMEOPTIONS {
char nGameType; unsigned char nGameType;
char nDifficulty; unsigned char nDifficulty;
int nEpisode; int nEpisode;
int nLevel; int nLevel;
char zLevelName[BMAX_PATH]; char zLevelName[BMAX_PATH];

View file

@ -36,7 +36,7 @@ public:
LoadSave() { LoadSave() {
loadSaves.Push(this); loadSaves.Push(this);
} }
//~LoadSave() { } virtual ~LoadSave() = default;
virtual void Save(void); virtual void Save(void);
virtual void Load(void); virtual void Load(void);
void Read(void *, int); void Read(void *, int);

View file

@ -42,7 +42,7 @@ class BloodSoundEngine : public SoundEngine
{ {
// client specific parts of the sound engine go in this class. // client specific parts of the sound engine go in this class.
void CalcPosVel(int type, const void* source, const float pt[3], int channum, int chanflags, FSoundID chanSound, FVector3* pos, FVector3* vel, FSoundChan *channel) override; void CalcPosVel(int type, const void* source, const float pt[3], int channum, int chanflags, FSoundID chanSound, FVector3* pos, FVector3* vel, FSoundChan *channel) override;
TArray<uint8_t> ReadSound(int lumpnum); TArray<uint8_t> ReadSound(int lumpnum) override;
public: public:
BloodSoundEngine() BloodSoundEngine()

View file

@ -1055,7 +1055,7 @@ void OperateSprite(int nSprite, XSPRITE *pXSprite, EVENT event)
case 4: case 4:
for (int i = 0; i < 8; i++) pPlayer->hasKey[i] = false; for (int i = 0; i < 8; i++) pPlayer->hasKey[i] = false;
if (pXSprite->data2) break; if (pXSprite->data2) break;
fallthrough__; break;
} }
break; break;

View file

@ -1105,8 +1105,6 @@ enum cutsceneflags {
CUTSCENE_TEXTUREFILTER = 4, CUTSCENE_TEXTUREFILTER = 4,
}; };
#ifdef USE_OPENGL
enum { enum {
TEXFILTER_OFF = 0, // GL_NEAREST TEXFILTER_OFF = 0, // GL_NEAREST
TEXFILTER_ON = 5, // GL_LINEAR_MIPMAP_LINEAR TEXFILTER_ON = 5, // GL_LINEAR_MIPMAP_LINEAR
@ -1137,7 +1135,6 @@ extern int32_t glrendmode;
extern int32_t r_rortexture; extern int32_t r_rortexture;
extern int32_t r_rortexturerange; extern int32_t r_rortexturerange;
extern int32_t r_rorphase; extern int32_t r_rorphase;
#endif
void hicinit(void); void hicinit(void);
void hicsetpalettetint(int32_t palnum, char r, char g, char b, char sr, char sg, char sb, polytintflags_t effect); void hicsetpalettetint(int32_t palnum, char r, char g, char b, char sr, char sg, char sb, polytintflags_t effect);

View file

@ -1,8 +1,10 @@
// SDL interface layer for the Build Engine // SDL interface layer for the Build Engine
// Use SDL 1.2 or 2.0 from http://www.libsdl.org // Use SDL 1.2 or 2.0 from http://www.libsdl.org
#ifdef _WIN32
#include <Windows.h> #include <Windows.h>
#include <CommCtrl.h> #include <CommCtrl.h>
#endif
#include <signal.h> #include <signal.h>
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>

View file

@ -300,13 +300,13 @@ class FFloatCVar : public FBaseCVar
public: public:
FFloatCVar (const char *name, float def, uint32_t flags, void (*callback)(FFloatCVar &)=NULL, const char* descr = nullptr); FFloatCVar (const char *name, float def, uint32_t flags, void (*callback)(FFloatCVar &)=NULL, const char* descr = nullptr);
virtual ECVarType GetRealType () const; virtual ECVarType GetRealType () const override;
virtual UCVarValue GetGenericRep (ECVarType type) const; virtual UCVarValue GetGenericRep (ECVarType type) const override ;
virtual UCVarValue GetFavoriteRep (ECVarType *type) const; virtual UCVarValue GetFavoriteRep (ECVarType *type) const override;
virtual UCVarValue GetGenericRepDefault (ECVarType type) const; virtual UCVarValue GetGenericRepDefault (ECVarType type) const override;
virtual UCVarValue GetFavoriteRepDefault (ECVarType *type) const; virtual UCVarValue GetFavoriteRepDefault (ECVarType *type) const override;
virtual void SetGenericRepDefault (UCVarValue value, ECVarType type); virtual void SetGenericRepDefault (UCVarValue value, ECVarType type) override;
const char *GetHumanString(int precision) const override; const char *GetHumanString(int precision) const override;
float operator= (float floatval) float operator= (float floatval)
@ -315,7 +315,7 @@ public:
inline float operator *() const { return Value; } inline float operator *() const { return Value; }
protected: protected:
virtual void DoSet (UCVarValue value, ECVarType type); virtual void DoSet (UCVarValue value, ECVarType type) override;
public: // for the menu code which still needs variable references. (Cannot change everything at once.) public: // for the menu code which still needs variable references. (Cannot change everything at once.)
float Value; float Value;

View file

@ -139,9 +139,9 @@ struct FUncompressedLump : public FResourceLump
{ {
int Position; int Position;
virtual FileReader *GetReader(); FileReader *GetReader() override;
int ValidateCache() override; int ValidateCache() override;
virtual int GetFileOffset() { return Position; } virtual int GetFileOffset() override { return Position; }
}; };
@ -188,9 +188,9 @@ struct FClonedLump : public FResourceLump
{ {
parent = lump; parent = lump;
} }
void* Lock() { return parent->Lock(); } void* Lock() override { return parent->Lock(); }
void Unlock(bool mayfree) override { parent->Unlock(mayfree); } void Unlock(bool mayfree) override { parent->Unlock(mayfree); }
void* Get() { return parent->Get(); } void* Get() override { return parent->Get(); }
int ValidateCache() override { return parent->ValidateCache(); } int ValidateCache() override { return parent->ValidateCache(); }
}; };

View file

@ -1,4 +1,4 @@
#pragma once; #pragma once
#include "c_cvars.h" #include "c_cvars.h"
EXTERN_CVAR(Bool, cl_crosshair) EXTERN_CVAR(Bool, cl_crosshair)

View file

@ -487,6 +487,7 @@ struct BuildArtFile
{ {
filename = std::move(other.filename); filename = std::move(other.filename);
RawData = std::move(other.RawData); RawData = std::move(other.RawData);
return *this;
} }
}; };

View file

@ -12,6 +12,17 @@
#include <stdarg.h> #include <stdarg.h>
#include "zstring.h" #include "zstring.h"
#if !defined(GUID_DEFINED)
#define GUID_DEFINED
typedef struct _GUID
{
uint32_t Data1;
uint16_t Data2;
uint16_t Data3;
uint8_t Data4[8];
} GUID;
#endif
template <typename T, size_t N> template <typename T, size_t N>
char(&_ArraySizeHelper(T(&array)[N]))[N]; char(&_ArraySizeHelper(T(&array)[N]))[N];

View file

@ -52,6 +52,12 @@ int DPrintf (int level, const char *format, ...) ATTRIBUTE((format(printf,2,3)))
void OSD_Printf(const char *format, ...) ATTRIBUTE((format(printf,1,2))); void OSD_Printf(const char *format, ...) ATTRIBUTE((format(printf,1,2)));
// Sometimes compilers can be really stupid... (but why do I have to globally silence the warning to make the compiler shut up here...???)
#if defined(__GNUC__) || defined(__clang__)
//#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
template<class... Args> template<class... Args>
inline void initprintf(const char *format, Args&&... args) //ATTRIBUTE((format(printf,1,2))) inline void initprintf(const char *format, Args&&... args) //ATTRIBUTE((format(printf,1,2)))
{ {
@ -65,6 +71,11 @@ inline void buildprintf(const char *format, Args&&... args) //ATTRIBUTE((format(
OSD_Printf(format, std::forward<Args>(args)...); OSD_Printf(format, std::forward<Args>(args)...);
} }
/*
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
*/
inline void initputs(const char *s) inline void initputs(const char *s)

View file

@ -1,7 +1,13 @@
cmake_minimum_required( VERSION 3.1.0 ) cmake_minimum_required( VERSION 3.1.0 )
require_stricmp()
require_strnicmp()
# Build does not work with signed chars!
if (MSVC) if (MSVC)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" )
else()
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funsigned-char -Wno-missing-braces -Wno-char-subscripts" )
endif() endif()
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../../build/include" ) include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../../build/include" )
@ -13,6 +19,7 @@ include_directories( "${ZLIB_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${BZIP2_INCL
endif() endif()
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../build/include ${CMAKE_CURRENT_SOURCE_DIR}/../build/include
${CMAKE_CURRENT_SOURCE_DIR}/../audiolib/include ${CMAKE_CURRENT_SOURCE_DIR}/../audiolib/include
${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include ${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include

View file

@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "animlib.h" #include "animlib.h"
#include "cmdlib.h" #include "cmdlib.h"
#include "compat.h" #include "compat.h"
#include "build.h"
#include "../glbackend/glbackend.h" #include "../glbackend/glbackend.h"
@ -406,9 +407,7 @@ int32_t Anim_Play(const char *fn)
#endif #endif
// ANM playback --- v v v --- // ANM playback --- v v v ---
#ifdef USE_OPENGL
int32_t ogltexfiltermode = hw_texfilter; int32_t ogltexfiltermode = hw_texfilter;
#endif
TArray<uint8_t> buffer; TArray<uint8_t> buffer;
auto fr = fileSystem.OpenFileReader(fn, 0); auto fr = fileSystem.OpenFileReader(fn, 0);

View file

@ -1261,7 +1261,7 @@ void Screen_Play(void)
#if !defined LUNATIC #if !defined LUNATIC
#if defined __GNUC__ || defined __clang__ #if defined __GNUC__ || defined __clang__
# define CON_USE_COMPUTED_GOTO // # define CON_USE_COMPUTED_GOTO does not work anymore with some of the changes.
#endif #endif
#ifdef CON_USE_COMPUTED_GOTO #ifdef CON_USE_COMPUTED_GOTO

View file

@ -35,7 +35,7 @@ class DukeSoundEngine : public SoundEngine
{ {
// client specific parts of the sound engine go in this class. // client specific parts of the sound engine go in this class.
void CalcPosVel(int type, const void* source, const float pt[3], int channum, int chanflags, FSoundID chanSound, FVector3* pos, FVector3* vel, FSoundChan *chan) override; void CalcPosVel(int type, const void* source, const float pt[3], int channum, int chanflags, FSoundID chanSound, FVector3* pos, FVector3* vel, FSoundChan *chan) override;
TArray<uint8_t> ReadSound(int lumpnum); TArray<uint8_t> ReadSound(int lumpnum) override;
public: public:
DukeSoundEngine() DukeSoundEngine()

View file

@ -1,7 +1,13 @@
cmake_minimum_required( VERSION 3.1.0 ) cmake_minimum_required( VERSION 3.1.0 )
require_stricmp()
require_strnicmp()
# Build does not work with signed chars!
if (MSVC) if (MSVC)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" )
else()
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funsigned-char -Wno-missing-braces -Wno-char-subscripts" )
endif() endif()
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../../build/include" ) include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../../build/include" )
@ -13,6 +19,7 @@ include_directories( "${ZLIB_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${BZIP2_INCL
endif() endif()
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../build/include ${CMAKE_CURRENT_SOURCE_DIR}/../build/include
${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include ${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include
${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty/include ${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty/include

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "PalEntry.h" #include "palentry.h"
#include "gl_buffers.h" #include "gl_buffers.h"
#include "renderstyle.h" #include "renderstyle.h"
class PolymostShader; class PolymostShader;

View file

@ -32,19 +32,18 @@
*/ */
#include "i_common.h" #include "i_common.h"
#include "s_sound.h" #include "s_soundinternal.h"
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include "c_console.h" #include "c_console.h"
#include "c_cvars.h" #include "c_cvars.h"
#include "cmdlib.h" #include "cmdlib.h"
#include "d_main.h"
#include "i_system.h" #include "i_system.h"
#include "m_argv.h" #include "m_argv.h"
#include "st_console.h" #include "st_console.h"
#include "version.h" #include "version.h"
#include "doomerrors.h" #include "printf.h"
#include "s_music.h" #include "s_music.h"

View file

@ -36,11 +36,6 @@
#include <fnmatch.h> #include <fnmatch.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include "d_protocol.h"
#include "doomdef.h"
#include "doomerrors.h"
#include "doomstat.h"
#include "g_game.h"
#include "gameconfigfile.h" #include "gameconfigfile.h"
#include "i_sound.h" #include "i_sound.h"
#include "i_system.h" #include "i_system.h"

View file

@ -44,7 +44,6 @@
#include "v_video.h" #include "v_video.h"
#include "bitmap.h" #include "bitmap.h"
#include "c_dispatch.h" #include "c_dispatch.h"
#include "doomstat.h"
#include "hardware.h" #include "hardware.h"
#include "i_system.h" #include "i_system.h"
#include "m_argv.h" #include "m_argv.h"

View file

@ -33,7 +33,6 @@
#include "i_common.h" #include "i_common.h"
#include "d_main.h"
#include "st_console.h" #include "st_console.h"
#include "v_text.h" #include "v_text.h"
#include "version.h" #include "version.h"

View file

@ -36,7 +36,6 @@
#import <Foundation/NSRunLoop.h> #import <Foundation/NSRunLoop.h>
#include "c_cvars.h" #include "c_cvars.h"
#include "doomtype.h"
#include "st_console.h" #include "st_console.h"
#include "st_start.h" #include "st_start.h"
#include "doomerrors.h" #include "doomerrors.h"

View file

@ -34,7 +34,6 @@
*/ */
#include "cmdlib.h" #include "cmdlib.h"
#include "d_main.h"
#include "version.h" #include "version.h"
#include "c_cvars.h" #include "c_cvars.h"
#include "m_argv.h" #include "m_argv.h"

View file

@ -1,7 +1,13 @@
cmake_minimum_required( VERSION 3.1.0 ) cmake_minimum_required( VERSION 3.1.0 )
require_stricmp()
require_strnicmp()
# Build does not work with signed chars!
if (MSVC) if (MSVC)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" )
else()
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funsigned-char -Wno-missing-braces -Wno-char-subscripts" )
endif() endif()
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../../build/include" ) include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../../build/include" )
@ -13,6 +19,7 @@ include_directories( "${ZLIB_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${BZIP2_INCL
endif() endif()
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../build/include ${CMAKE_CURRENT_SOURCE_DIR}/../build/include
${CMAKE_CURRENT_SOURCE_DIR}/../audiolib/include ${CMAKE_CURRENT_SOURCE_DIR}/../audiolib/include
${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include ${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include

View file

@ -440,9 +440,7 @@ int32_t Anim_Play(const char *fn)
#endif #endif
// ANM playback --- v v v --- // ANM playback --- v v v ---
#ifdef USE_OPENGL
int32_t ogltexfiltermode = hw_texfilter; int32_t ogltexfiltermode = hw_texfilter;
#endif
auto fr = fileSystem.OpenFileReader(fn, 0); auto fr = fileSystem.OpenFileReader(fn, 0);
if (!fr.isOpen()) if (!fr.isOpen())

View file

@ -153,7 +153,7 @@ struct GameInterface : ::GameInterface
void set_hud_scale(int size) override; void set_hud_scale(int size) override;
FString statFPS() override; FString statFPS() override;
GameStats getStats() override; GameStats getStats() override;
void DrawNativeMenuText(int fontnum, int state, double xpos, double ypos, float fontscale, const char* text, int flags); void DrawNativeMenuText(int fontnum, int state, double xpos, double ypos, float fontscale, const char* text, int flags) override;
void MenuOpened() override; void MenuOpened() override;
void MenuSound(EMenuSounds snd) override; void MenuSound(EMenuSounds snd) override;
void MenuClosed() override; void MenuClosed() override;

View file

@ -1,7 +1,13 @@
cmake_minimum_required( VERSION 3.1.0 ) cmake_minimum_required( VERSION 3.1.0 )
require_stricmp()
require_strnicmp()
# Build does not work with signed chars!
if (MSVC) if (MSVC)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J" )
else()
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funsigned-char -Wno-missing-braces -Wno-char-subscripts" )
endif() endif()
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../../build/include" ) include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../../build/include" )
@ -13,6 +19,7 @@ include_directories( "${ZLIB_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${BZIP2_INCL
endif() endif()
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../build/include ${CMAKE_CURRENT_SOURCE_DIR}/../build/include
${CMAKE_CURRENT_SOURCE_DIR}/../audiolib/include ${CMAKE_CURRENT_SOURCE_DIR}/../audiolib/include
${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include ${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include

View file

@ -300,7 +300,6 @@ DoActorDie(short SpriteNum, short weapon)
void void
DoDebrisCurrent(SPRITEp sp) DoDebrisCurrent(SPRITEp sp)
{ {
int xvect, yvect;
int nx, ny; int nx, ny;
int ret=0; int ret=0;
USERp u = User[sp - sprite]; USERp u = User[sp - sprite];
@ -400,9 +399,7 @@ DoActorSectorDamage(short SpriteNum)
int int
move_debris(short SpriteNum, int xchange, int ychange, int zchange) move_debris(short SpriteNum, int xchange, int ychange, int zchange)
{ {
SPRITEp sp = &sprite[SpriteNum];
USERp u = User[SpriteNum]; USERp u = User[SpriteNum];
int nx, ny;
u->ret = move_sprite(SpriteNum, xchange, ychange, zchange, u->ret = move_sprite(SpriteNum, xchange, ychange, zchange,
u->ceiling_dist, u->floor_dist, 0, ACTORMOVETICS); u->ceiling_dist, u->floor_dist, 0, ACTORMOVETICS);
@ -622,7 +619,6 @@ int
DoActorBeginSlide(short SpriteNum, short ang, short vel, short dec) DoActorBeginSlide(short SpriteNum, short ang, short vel, short dec)
{ {
USERp u = User[SpriteNum]; USERp u = User[SpriteNum];
SPRITEp sp = User[SpriteNum]->SpriteP;
SET(u->Flags, SPR_SLIDING); SET(u->Flags, SPR_SLIDING);
@ -642,7 +638,6 @@ int
DoActorSlide(short SpriteNum) DoActorSlide(short SpriteNum)
{ {
USERp u = User[SpriteNum]; USERp u = User[SpriteNum];
SPRITEp sp = User[SpriteNum]->SpriteP;
int nx, ny; int nx, ny;
nx = u->slide_vel * (int) sintable[NORM_ANGLE(u->slide_ang + 512)] >> 14; nx = u->slide_vel * (int) sintable[NORM_ANGLE(u->slide_ang + 512)] >> 14;
@ -670,7 +665,6 @@ int
DoActorBeginJump(short SpriteNum) DoActorBeginJump(short SpriteNum)
{ {
USERp u = User[SpriteNum]; USERp u = User[SpriteNum];
SPRITEp sp = User[SpriteNum]->SpriteP;
SET(u->Flags, SPR_JUMPING); SET(u->Flags, SPR_JUMPING);
RESET(u->Flags, SPR_FALLING); RESET(u->Flags, SPR_FALLING);

View file

@ -146,7 +146,6 @@ void
SetConsoleDmost(void) SetConsoleDmost(void)
{ {
int ystart; int ystart;
int xstart;
int i; int i;
int adj=0; int adj=0;
@ -289,8 +288,7 @@ void DrawBorderShade(PLAYERp pp, short shade_num, short wx1, short wy1, short wx
void void
BorderShade(PLAYERp pp, SWBOOL refresh) BorderShade(PLAYERp pp, SWBOOL refresh)
{ {
int i, j, k, l, wx1, wx2, wy1, wy2; int wx1, wx2, wy1, wy2;
PANEL_SPRITEp psp;
uint8_t lines; uint8_t lines;
wx1 = windowxy1.x - 1; wx1 = windowxy1.x - 1;
@ -457,7 +455,6 @@ static void BorderSetView(PLAYERp, int *Xdim, int *Ydim, int *ScreenSize)
static void static void
BorderRefresh(PLAYERp pp) BorderRefresh(PLAYERp pp)
{ {
int i, j;
int x, x2, y, y2; int x, x2, y, y2;
BORDER_INFO *b; BORDER_INFO *b;
@ -521,9 +518,7 @@ BorderRefresh(PLAYERp pp)
void SetBorder(PLAYERp pp, int value) void SetBorder(PLAYERp pp, int value)
{ {
int diff;
int Xdim, Ydim, ScreenSize; int Xdim, Ydim, ScreenSize;
SWBOOL set_view = TRUE;
if (pp != Player + myconnectindex) if (pp != Player + myconnectindex)
return; return;
@ -566,7 +561,6 @@ void SetBorder(PLAYERp pp, int value)
void void
SetRedrawScreen(PLAYERp pp) SetRedrawScreen(PLAYERp pp)
{ {
int i, j;
BORDER_INFO *b; BORDER_INFO *b;
if (pp != Player + myconnectindex) if (pp != Player + myconnectindex)

View file

@ -269,7 +269,7 @@ void ItemCheat(PLAYERp pp, const char *cheat_string)
PlayerUpdateKeys(pp); PlayerUpdateKeys(pp);
} }
VOID HealCheat(PLAYERp pp, const char *cheat_string) void HealCheat(PLAYERp pp, const char *cheat_string)
{ {
short pnum; short pnum;
const char *str = nullptr; const char *str = nullptr;
@ -283,7 +283,7 @@ VOID HealCheat(PLAYERp pp, const char *cheat_string)
if (str) PutStringInfo(pp, GStrings(str)); if (str) PutStringInfo(pp, GStrings(str));
} }
VOID SortKeyCheat(PLAYERp pp, const char *sKey) void SortKeyCheat(PLAYERp pp, const char *sKey)
{ {
const char *sTemp = ""; const char *sTemp = "";
@ -341,7 +341,7 @@ VOID SortKeyCheat(PLAYERp pp, const char *sKey)
KeysCheat(pp, sTemp); KeysCheat(pp, sTemp);
} }
VOID KeysCheat(PLAYERp pp, const char *cheat_string) void KeysCheat(PLAYERp pp, const char *cheat_string)
{ {
// Get KEYS // Get KEYS
PLAYERp p; PLAYERp p;

View file

@ -4,8 +4,6 @@
#ifdef _WIN32 #ifdef _WIN32
# include "windows_inc.h" # include "windows_inc.h"
#elif defined __APPLE__
# include "osxbits.h"
#endif #endif
#include "common.h" #include "common.h"

View file

@ -2141,10 +2141,9 @@ OperateTripTrigger(PLAYERp pp)
if (pp == Player+myconnectindex) if (pp == Player+myconnectindex)
PlayerSound(DIGI_ANCIENTSECRET, v3df_dontpan|v3df_doppler|v3df_follow,pp); PlayerSound(DIGI_ANCIENTSECRET, v3df_dontpan|v3df_doppler|v3df_follow,pp);
sprintf(ds, GStrings("TXTS_SECRET"));
SECRET_Trigger(pp->cursectnum); SECRET_Trigger(pp->cursectnum);
PutStringInfo(pp, ds); PutStringInfo(pp, GStrings("TXTS_SECRET"));
// always give to the first player // always give to the first player
Player->SecretsFound++; Player->SecretsFound++;
sectp->lotag = 0; sectp->lotag = 0;