BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Move import/export macros into CMake

Browse Source
This commit is contained in:
numzero 2023-02-20 00:16:55 +03:00
parent 06db7b7ab7
commit 5a2b807890
2 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/IrrCompileConfig.h
View File

@ -25,39 +25,15 @@
#define _IRR_MATERIAL_MAX_TEXTURES_ 4 #define _IRR_MATERIAL_MAX_TEXTURES_ 4
#ifdef _IRR_WINDOWS_API_ #ifdef _WIN32
// To build Irrlicht as a static library, you must define _IRR_STATIC_LIB_ in both the
// Irrlicht build, *and* in the user application, before #including <irrlicht.h>
#ifndef _IRR_STATIC_LIB_
#ifdef IRRLICHT_EXPORTS
#define IRRLICHT_API __declspec(dllexport)
#else
#define IRRLICHT_API __declspec(dllimport)
#endif // IRRLICHT_EXPORT
#else
#define IRRLICHT_API
#endif // _IRR_STATIC_LIB_
// Declare the calling convention.
#if defined(_STDCALL_SUPPORTED)
#define IRRCALLCONV __stdcall #define IRRCALLCONV __stdcall
#else #else
#define IRRCALLCONV __cdecl #define IRRCALLCONV
#endif // STDCALL_SUPPORTED
#else // _IRR_WINDOWS_API_
// Force symbol export in shared libraries built with gcc.
#if defined(__GNUC__) && !defined(_IRR_STATIC_LIB_) && defined(IRRLICHT_EXPORTS)
#define IRRLICHT_API __attribute__ ((visibility("default")))
#else
#define IRRLICHT_API
#endif #endif
#define IRRCALLCONV #ifndef IRRLICHT_API
#define IRRLICHT_API
#endif // _IRR_WINDOWS_API_ #endif
#define _IRR_COMPILE_WITH_GUI_ #define _IRR_COMPILE_WITH_GUI_

15
source/Irrlicht/CMakeLists.txt
View File

@ -4,7 +4,13 @@ option(USE_SDL2 "Use the SDL2 backend" FALSE)
# Compiler flags # Compiler flags
add_definitions(-DIRRLICHT_EXPORTS) add_definitions(-DIRRLICHT_EXPORTS)
if(NOT BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
if(WIN32)
add_definitions("-DIRRLICHT_API=__declspec(dllexport)")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$")
add_definitions("-DIRRLICHT_API=__attribute__ ((visibility(\"default\")))")
endif()
else()
add_definitions(-D_IRR_STATIC_LIB_) add_definitions(-D_IRR_STATIC_LIB_)
endif() endif()
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@ -453,13 +459,12 @@ target_include_directories(IrrlichtMt
target_link_libraries(IrrlichtMt PRIVATE ${link_libs}) target_link_libraries(IrrlichtMt PRIVATE ${link_libs})
# Propagate static library flag to lib users, only needed for Windows
if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(IrrlichtMt INTERFACE _IRR_STATIC_LIB_)
endif()
if(WIN32) if(WIN32)
target_compile_definitions(IrrlichtMt INTERFACE _IRR_WINDOWS_API_) target_compile_definitions(IrrlichtMt INTERFACE _IRR_WINDOWS_API_)
endif() endif()
if(WIN32 AND BUILD_SHARED_LIBS)
target_compile_definitions(IrrlichtMt INTERFACE IRRLICHT_API=__declspec(dllimport))
endif()
if(APPLE OR ANDROID OR EMSCRIPTEN) if(APPLE OR ANDROID OR EMSCRIPTEN)
target_compile_definitions(IrrlichtMt PUBLIC IRR_MOBILE_PATHS) target_compile_definitions(IrrlichtMt PUBLIC IRR_MOBILE_PATHS)
endif() endif()