diff options
| author | Jeffery Myers <[email protected]> | 2021-10-07 11:17:45 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-07 20:17:45 +0200 |
| commit | 33ed452439a6b28a39f190714e18ee5dcb2e7673 (patch) | |
| tree | afa5522ad45f0d559b59804994050bd2a5d11258 /src | |
| parent | bb2763cc1faea71c2f21a66b9f0e0bd43532a04c (diff) | |
| download | raylib-33ed452439a6b28a39f190714e18ee5dcb2e7673.tar.gz raylib-33ed452439a6b28a39f190714e18ee5dcb2e7673.zip | |
Fix dll exports so that raylib builds in visual studio again. (#2037)
Diffstat (limited to 'src')
| -rw-r--r-- | src/raylib.h | 9 | ||||
| -rw-r--r-- | src/raymath.h | 35 |
2 files changed, 19 insertions, 25 deletions
diff --git a/src/raylib.h b/src/raylib.h index ef737913..82c53ba1 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -83,11 +83,6 @@ #define RAYLIB_VERSION "4.0" -// Function specifiers definition -#ifndef RLAPI - #define RLAPI // Functions defined as 'extern' by default (implicit specifiers) -#endif - // Function specifiers in case library is build/used as a shared library (Windows) // NOTE: Microsoft specifiers to tell compiler that symbols are imported/exported from a .dll #if defined(_WIN32) @@ -95,7 +90,11 @@ #define RLAPI __declspec(dllexport) // We are building the library as a Win32 shared library (.dll) #elif defined(USE_LIBTYPE_SHARED) #define RLAPI __declspec(dllimport) // We are using the library as a Win32 shared library (.dll) + #else + #define RLAPI // Functions defined as 'extern' by default (implicit specifiers) #endif +#else + #define RLAPI // Functions defined as 'extern' by default (implicit specifiers) #endif //---------------------------------------------------------------------------------- diff --git a/src/raymath.h b/src/raymath.h index 43606436..8f579ed6 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -52,29 +52,24 @@ #endif // Function specifiers definition -#ifndef RMAPI - #if defined(RAYMATH_IMPLEMENTATION) - #define RMAPI extern inline // Functions defined as 'extern inline' by default - - // Function specifiers in case library is build/used as a shared library (Windows) - // NOTE: Microsoft specifiers to tell compiler that symbols are imported/exported from a .dll - #if defined(_WIN32) - #if defined(BUILD_LIBTYPE_SHARED) - #define RMAPI __declspec(dllexport) // We are building the library as a Win32 shared library (.dll) - #elif defined(USE_LIBTYPE_SHARED) - #define RMAPI __declspec(dllimport) // We are using the library as a Win32 shared library (.dll) - #endif - #endif - #elif defined(RAYMATH_STATIC_INLINE) - #define RMAPI static inline // Functions may be inlined, no external out-of-line definition +#if defined(RAYMATH_IMPLEMENTATION) + #if defined(_WIN32) && defined(BUILD_LIBTYPE_SHARED) + #define RMAPI __declspec(dllexport) extern inline // We are building raylib as a Win32 shared library (.dll). + #elif defined(_WIN32) && defined(USE_LIBTYPE_SHARED) + #define RMAPI __declspec(dllimport) // We are using raylib as a Win32 shared library (.dll) #else - #if defined(__TINYC__) - #define RMAPI static inline // WARNING: Plain inline not supported by tinycc (See issue #435) - #else - #define RMAPI inline - #endif + #define RMAPI extern inline // Provide external definition + #endif +#elif defined(RAYMATH_STATIC_INLINE) + #define RMAPI static inline // Functions may be inlined, no external out-of-line definition +#else + #if defined(__TINYC__) + #define RMAPI static inline // plain inline not supported by tinycc (See issue #435) + #else + #define RMAPI inline // Functions may be inlined or external definition used #endif #endif + //---------------------------------------------------------------------------------- // Defines and Macros |