mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-31 18:31:04 +00:00
Remove Irrlicht versioning
This commit is contained in:
sfan5
parent
b487341c32
commit
d53ef90a73
12 changed files with 2 additions and 133 deletions
|
|
@ -4,19 +4,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
//! Identifies the IrrlichtMt fork customized for the Minetest engine
|
||||
#define IRRLICHT_VERSION_MT_REVISION 15
|
||||
#define IRRLICHT_VERSION_MT "mt15"
|
||||
|
||||
//! Irrlicht SDK Version
|
||||
#define IRRLICHT_VERSION_MAJOR 1
|
||||
#define IRRLICHT_VERSION_MINOR 9
|
||||
#define IRRLICHT_VERSION_REVISION 0
|
||||
// This flag will be defined only in SVN, the official release code will have
|
||||
// it undefined
|
||||
#define IRRLICHT_VERSION_SVN alpha
|
||||
#define IRRLICHT_SDK_VERSION "1.9.0" IRRLICHT_VERSION_MT
|
||||
|
||||
#ifdef _WIN32
|
||||
#define IRRCALLCONV __stdcall
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -194,12 +194,6 @@ public:
|
|||
/** IrrlichtDevice::run() will always return false after closeDevice() was called. */
|
||||
virtual void closeDevice() = 0;
|
||||
|
||||
//! Get the version of the engine.
|
||||
/** The returned string
|
||||
will look like this: "1.2.3" or this: "1.2".
|
||||
\return String which contains the version. */
|
||||
virtual const c8 *getVersion() const = 0;
|
||||
|
||||
//! Sets a new user event receiver which will receive events from the engine.
|
||||
/** Return true in IEventReceiver::OnEvent to prevent the event from continuing along
|
||||
the chain of event receivers. The path that an event takes through the system depends
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
#include "ILogger.h"
|
||||
#include "position2d.h"
|
||||
#include "path.h"
|
||||
#include "IrrCompileConfig.h" // for IRRLICHT_SDK_VERSION
|
||||
|
||||
namespace irr
|
||||
{
|
||||
|
|
@ -44,7 +43,6 @@ struct SIrrlichtCreationParameters
|
|||
#else
|
||||
LoggingLevel(ELL_INFORMATION),
|
||||
#endif
|
||||
SDK_version_do_not_use(IRRLICHT_SDK_VERSION),
|
||||
PrivateData(0),
|
||||
#ifdef IRR_MOBILE_PATHS
|
||||
OGLES2ShaderPath("media/Shaders/")
|
||||
|
|
@ -54,37 +52,6 @@ struct SIrrlichtCreationParameters
|
|||
{
|
||||
}
|
||||
|
||||
SIrrlichtCreationParameters(const SIrrlichtCreationParameters &other) :
|
||||
SDK_version_do_not_use(IRRLICHT_SDK_VERSION)
|
||||
{
|
||||
*this = other;
|
||||
}
|
||||
|
||||
SIrrlichtCreationParameters &operator=(const SIrrlichtCreationParameters &other)
|
||||
{
|
||||
DeviceType = other.DeviceType;
|
||||
DriverType = other.DriverType;
|
||||
WindowSize = other.WindowSize;
|
||||
WindowPosition = other.WindowPosition;
|
||||
Bits = other.Bits;
|
||||
ZBufferBits = other.ZBufferBits;
|
||||
Fullscreen = other.Fullscreen;
|
||||
WindowMaximized = other.WindowMaximized;
|
||||
WindowResizable = other.WindowResizable;
|
||||
Stencilbuffer = other.Stencilbuffer;
|
||||
Vsync = other.Vsync;
|
||||
AntiAlias = other.AntiAlias;
|
||||
WithAlphaChannel = other.WithAlphaChannel;
|
||||
Doublebuffer = other.Doublebuffer;
|
||||
Stereobuffer = other.Stereobuffer;
|
||||
EventReceiver = other.EventReceiver;
|
||||
WindowId = other.WindowId;
|
||||
LoggingLevel = other.LoggingLevel;
|
||||
PrivateData = other.PrivateData;
|
||||
OGLES2ShaderPath = other.OGLES2ShaderPath;
|
||||
return *this;
|
||||
}
|
||||
|
||||
//! Type of the device.
|
||||
/** This setting decides the windowing system used by the device, most device types are native
|
||||
to a specific operating system and so may not be available.
|
||||
|
|
@ -247,11 +214,6 @@ struct SIrrlichtCreationParameters
|
|||
*/
|
||||
ELOG_LEVEL LoggingLevel;
|
||||
|
||||
//! Don't use or change this parameter.
|
||||
/** Always set it to IRRLICHT_SDK_VERSION, which is done by default.
|
||||
This is needed for sdk version checks. */
|
||||
const c8 *const SDK_version_do_not_use;
|
||||
|
||||
//! Define some private data storage.
|
||||
/** Used when platform devices need access to OS specific data structures etc.
|
||||
This is only used for Android at the moment in order to access the native
|
||||
|
|
|
|||
|
|
@ -38,12 +38,6 @@ CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters ¶ms) :
|
|||
os::Printer::Logger = Logger;
|
||||
|
||||
FileSystem = io::createFileSystem();
|
||||
|
||||
core::stringc s = "Irrlicht Engine version ";
|
||||
s.append(getVersion());
|
||||
os::Printer::log(s.c_str(), ELL_INFORMATION);
|
||||
|
||||
checkVersion(params.SDK_version_do_not_use);
|
||||
}
|
||||
|
||||
CIrrDeviceStub::~CIrrDeviceStub()
|
||||
|
|
@ -129,12 +123,6 @@ bool CIrrDeviceStub::setWindowIcon(const video::IImage *img)
|
|||
return false;
|
||||
}
|
||||
|
||||
//! Returns the version of the engine.
|
||||
const char *CIrrDeviceStub::getVersion() const
|
||||
{
|
||||
return IRRLICHT_SDK_VERSION;
|
||||
}
|
||||
|
||||
//! \return Returns a pointer to the mouse cursor control interface.
|
||||
gui::ICursorControl *CIrrDeviceStub::getCursorControl()
|
||||
{
|
||||
|
|
@ -147,24 +135,6 @@ video::IContextManager *CIrrDeviceStub::getContextManager()
|
|||
return ContextManager;
|
||||
}
|
||||
|
||||
//! checks version of sdk and prints warning if there might be a problem
|
||||
bool CIrrDeviceStub::checkVersion(const char *version)
|
||||
{
|
||||
if (strcmp(getVersion(), version)) {
|
||||
core::stringc w;
|
||||
w = "Warning: The library version of the Irrlicht Engine (";
|
||||
w += getVersion();
|
||||
w += ") does not match the version the application was compiled with (";
|
||||
w += version;
|
||||
w += "). This may cause problems.";
|
||||
os::Printer::log(w.c_str(), ELL_WARNING);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
//! Compares to the last call of this function to return double and triple clicks.
|
||||
u32 CIrrDeviceStub::checkSuccessiveClicks(s32 mouseX, s32 mouseY, EMOUSE_INPUT_EVENT inputEvent)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -70,9 +70,6 @@ public:
|
|||
//! Sets the window icon.
|
||||
bool setWindowIcon(const video::IImage *img) override;
|
||||
|
||||
//! Returns the version of the engine.
|
||||
const char *getVersion() const override;
|
||||
|
||||
//! send the event to the right receiver
|
||||
bool postEventFromUser(const SEvent &event) override;
|
||||
|
||||
|
|
@ -159,9 +156,6 @@ public:
|
|||
protected:
|
||||
void createGUIAndScene();
|
||||
|
||||
//! checks version of SDK and prints warning if there might be a problem
|
||||
bool checkVersion(const char *version);
|
||||
|
||||
//! Compares to the last call of this function to return double and triple clicks.
|
||||
/** Needed for win32 device event handling
|
||||
\return Returns only 1,2 or 3. A 4th click will start with 1 again.
|
||||
|
|
|
|||
|
|
@ -56,20 +56,6 @@ elseif(MSVC)
|
|||
add_compile_options(/D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
|
||||
endif()
|
||||
|
||||
# Sanity-check version
|
||||
|
||||
include(CheckCXXSourceCompiles)
|
||||
set(CMAKE_REQUIRED_INCLUDES ${PROJECT_SOURCE_DIR}/include)
|
||||
unset(REVISION_SANITY_CHECK CACHE)
|
||||
check_cxx_source_compiles("#include <IrrCompileConfig.h>\n\
|
||||
#if IRRLICHT_VERSION_MT_REVISION != ${IRRLICHTMT_REVISION}\n\
|
||||
#error\n\
|
||||
#endif\n\
|
||||
int main() {}" REVISION_SANITY_CHECK)
|
||||
if(NOT REVISION_SANITY_CHECK)
|
||||
message(FATAL_ERROR "IrrlichtMt revision number mismatches between CMake and headers.")
|
||||
endif()
|
||||
|
||||
# Platform-independent configuration (hard-coded currently)
|
||||
add_definitions(
|
||||
-DIRR_ENABLE_BUILTIN_FONT
|
||||
|
|
@ -246,11 +232,12 @@ endif()
|
|||
|
||||
# Required libs
|
||||
|
||||
include(CheckCXXSourceCompiles)
|
||||
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(JPEG REQUIRED)
|
||||
find_package(PNG REQUIRED)
|
||||
|
||||
|
||||
if(ENABLE_GLES1)
|
||||
# only tested on Android, probably works on Linux (is this needed anywhere else?)
|
||||
find_library(OPENGLES_LIBRARY NAMES GLESv1_CM REQUIRED)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue