diff options
| author | raysan5 <[email protected]> | 2020-04-01 11:06:05 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2020-04-01 11:06:05 +0200 |
| commit | adb20569befc3836d9f5fd8f98edb93ff676cfd8 (patch) | |
| tree | 2829278e3d015200fcff07dd252e6dc471a27f1e /src | |
| parent | 07f3a65a96e83976d9d4533caadff6b4b615b05c (diff) | |
| download | raylib-adb20569befc3836d9f5fd8f98edb93ff676cfd8.tar.gz raylib-adb20569befc3836d9f5fd8f98edb93ff676cfd8.zip | |
Review shared library building
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 4 | ||||
| -rw-r--r-- | src/raylib.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 8e598e5b..ede7c7f7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -214,7 +214,7 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) endif # Define default C compiler and archiver to pack library -CC ?= gcc +CC = gcc AR = ar ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -484,7 +484,7 @@ else ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # TODO: Compile resource file raylib.dll.rc for linkage on raylib.dll generation - $(CC) -shared -o $(RAYLIB_RELEASE_PATH)/raylib.dll $(OBJS) -L$(RAYLIB_RELEASE_PATH) -static-libgcc -lopengl32 -lgdi32 -lwinmm -Wl,--out-implib,$(RAYLIB_RELEASE_PATH)/libraylibdll.a + $(CC) -shared -o $(RAYLIB_RELEASE_PATH)/raylib.dll $(OBJS) $(RAYLIB_RELEASE_PATH)/raylib.dll.rc.data -L$(RAYLIB_RELEASE_PATH) -static-libgcc -lopengl32 -lgdi32 -lwinmm -Wl,--out-implib,$(RAYLIB_RELEASE_PATH)/libraylib.dll.a @echo "raylib dynamic library (raylib.dll) and import library (libraylibdll.a) generated!" endif ifeq ($(PLATFORM_OS),LINUX) diff --git a/src/raylib.h b/src/raylib.h index 791da41f..d2dc8a54 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -76,15 +76,17 @@ #include <stdarg.h> // Required for: va_list - Only used by TraceLogCallback -#define RLAPI // We are building or using raylib as a static library (or Linux shared library) - #if defined(_WIN32) // Microsoft attibutes to tell compiler that symbols are imported/exported from a .dll #if defined(BUILD_LIBTYPE_SHARED) #define RLAPI __declspec(dllexport) // We are building raylib as a Win32 shared library (.dll) #elif defined(USE_LIBTYPE_SHARED) #define RLAPI __declspec(dllimport) // We are using raylib as a Win32 shared library (.dll) + #else + #define RLAPI // We are building or using raylib as a static library #endif +#else + #define RLAPI // We are building or using raylib as a static library (or Linux shared library) #endif //---------------------------------------------------------------------------------- |