minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-26 10:40:31 +01:00
Code Issues Projects Releases Wiki Activity

cleanup: remove _IRR_COMPILE_ANDROID_ASSET_READER_ build flag

Browse Source 
it's enabled inconditionally on android

also remove some _IRR_COMPILE_WITH_ANDROID_DEVICE_ which are useless because cmake is already properly configured
This commit is contained in:
Loic Blot 2023-10-09 09:08:00 +02:00 committed by sfan5
parent ae63f1bf02
commit 7cade6f27f
9 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/Android/CAndroidAssetFileArchive.cpp
View File

@ -3,7 +3,6 @@
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifdef _IRR_COMPILE_ANDROID_ASSET_READER_
#include "CAndroidAssetReader.h"
@ -106,4 +105,3 @@ void CAndroidAssetFileArchive::addDirectoryToFileList(const io::path &dirname_)
} // end namespace io
} // end namespace irr
#endif // _IRR_COMPILE_ANDROID_ASSET_READER_

4
source/Irrlicht/Android/CAndroidAssetFileArchive.h
View File

@ -4,9 +4,6 @@
#pragma once
#ifdef _IRR_COMPILE_ANDROID_ASSET_READER_
#include "IReadFile.h"
#include "IFileArchive.h"
#include "CFileList.h"
@ -61,4 +58,3 @@ namespace io
} // end namespace io
} // end namespace irr
#endif // _IRR_COMPILE_ANDROID_ASSET_READER_

4
source/Irrlicht/Android/CAndroidAssetReader.cpp
View File

@ -2,9 +2,6 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifdef _IRR_COMPILE_ANDROID_ASSET_READER_
#include "CAndroidAssetReader.h"
#include "CReadFile.h"
@ -69,4 +66,3 @@ const io::path& CAndroidAssetReader::getFileName() const
} // end namespace io
} // end namespace irr
#endif // _IRR_COMPILE_ANDROID_ASSET_READER_

4
source/Irrlicht/Android/CAndroidAssetReader.h
View File

@ -4,9 +4,6 @@
#pragma once
#ifdef _IRR_COMPILE_ANDROID_ASSET_READER_
#include "IReadFile.h"
struct AAssetManager;
@ -66,4 +63,3 @@ namespace io
} // end namespace io
} // end namespace irr
#endif // _IRR_COMPILE_ANDROID_ASSET_READER_

4
source/Irrlicht/Android/CIrrDeviceAndroid.cpp
View File

@ -5,8 +5,6 @@
#include "CIrrDeviceAndroid.h"
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
#include "os.h"
#include "CFileSystem.h"
#include "CAndroidAssetReader.h"
@ -858,5 +856,3 @@ bool CIrrDeviceAndroid::isGyroscopeAvailable()
}
} // end namespace irr
#endif

2
source/Irrlicht/Android/CIrrDeviceAndroid.h
View File

@ -5,7 +5,6 @@
#pragma once
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
#include "CIrrDeviceStub.h"
#include "IrrlichtDevice.h"
@ -98,4 +97,3 @@ namespace irr
} // end namespace irr
#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_

5
source/Irrlicht/Android/CKeyEventWrapper.cpp
View File

@ -3,8 +3,6 @@
#include "CKeyEventWrapper.h"
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
#include "os.h"
namespace irr
@ -58,6 +56,3 @@ int CKeyEventWrapper::getUnicodeChar(int metaState)
} // namespace jni
} // namespace irr
#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_

4
source/Irrlicht/Android/CKeyEventWrapper.h
View File

@ -3,8 +3,6 @@
#pragma once
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
#include <jni.h>
struct android_app;
@ -35,5 +33,3 @@ private:
} // namespace jni
} // namespace irr
#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_

2
source/Irrlicht/CMakeLists.txt
View File

@ -88,7 +88,7 @@ elseif(APPLE)
add_definitions(-D_IRR_OSX_PLATFORM_)
set(DEVICE "OSX")
elseif(ANDROID)
add_definitions(-D_IRR_ANDROID_PLATFORM_ -D_IRR_COMPILE_ANDROID_ASSET_READER_)
add_definitions(-D_IRR_ANDROID_PLATFORM_)
if(USE_SDL2)
message(FATAL_ERROR "SDL2 device is not (yet) supported on Android")
endif()