diff options
| author | raysan5 <[email protected]> | 2020-08-20 17:37:01 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2020-08-20 17:37:01 +0200 |
| commit | b499b50154b01f4d36880391bdc8c8112ffb675a (patch) | |
| tree | c13eef9a4bedaeb081d0a98a913855111a5e20f8 /src | |
| parent | d64d017c1c8d13a92538bd4adb98d763e51e3382 (diff) | |
| download | raylib-b499b50154b01f4d36880391bdc8c8112ffb675a.tar.gz raylib-b499b50154b01f4d36880391bdc8c8112ffb675a.zip | |
Avoid architecture selection on gcc, use correct gcc version instead
Review raylib resource file for DLL compilation
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 21 | ||||
| -rw-r--r-- | src/raylib.dll.rc.data | bin | 11182 -> 11246 bytes | |||
| -rw-r--r-- | src/raylib.rc.data | bin | 11182 -> 11182 bytes |
3 files changed, 5 insertions, 16 deletions
diff --git a/src/Makefile b/src/Makefile index f50c6111..0c5f9d6b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -58,12 +58,12 @@ RAYLIB_LIBTYPE ?= STATIC # Build mode for library: DEBUG or RELEASE RAYLIB_BUILD_MODE ?= RELEASE -# Build architecture (x86: 32bit or x64: 64bit) -RAYLIB_BUILD_ARCH ?= x86 - # Build output name for the library RAYLIB_LIB_NAME ?= raylib +# Define resource file for DLL properties +RAYLIB_RES_FILE ?= ./raylib.dll.rc.data + # Define raylib platform # Options: PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB PLATFORM ?= PLATFORM_DESKTOP @@ -260,17 +260,6 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) endif endif -# GCC could support multilib building for x86 (-m32) and x64 (-m64) -ifeq ($(CC), gcc) - CFLAGS += -m32 - LDFLAGS += -m32 - ifeq ($(RAYLIB_BUILD_ARCH),x64) - CFLAGS += -m64 - LDFLAGS += -m64 - endif -endif - - # Define compiler flags: # -O1 defines optimization level # -g include debug information on compilation @@ -484,8 +473,8 @@ else ifeq ($(RAYLIB_LIBTYPE),SHARED) 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_LIB_NAME).dll $(OBJS) $(LDFLAGS) -static-libgcc -lopengl32 -lgdi32 -lwinmm -Wl,--out-implib,$(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME)dll.a + # NOTE: Linking with provided resource file + $(CC) -shared -o $(RAYLIB_RELEASE_PATH)/$(RAYLIB_LIB_NAME).dll $(OBJS) $(RAYLIB_RES_FILE) $(LDFLAGS) -static-libgcc -lopengl32 -lgdi32 -lwinmm -Wl,--out-implib,$(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME)dll.a @echo "raylib dynamic library ($(RAYLIB_LIB_NAME).dll) and import library (lib$(RAYLIB_LIB_NAME)dll.a) generated!" endif ifeq ($(PLATFORM_OS),LINUX) diff --git a/src/raylib.dll.rc.data b/src/raylib.dll.rc.data Binary files differindex 7ade4486..0c1e2dae 100644 --- a/src/raylib.dll.rc.data +++ b/src/raylib.dll.rc.data diff --git a/src/raylib.rc.data b/src/raylib.rc.data Binary files differindex 81e74522..30f2c583 100644 --- a/src/raylib.rc.data +++ b/src/raylib.rc.data |