From b499b50154b01f4d36880391bdc8c8112ffb675a Mon Sep 17 00:00:00 2001
From: raysan5 <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 17:37:01 +0200
Subject: [PATCH] Avoid architecture selection on gcc, use correct gcc version
 instead

Review raylib resource file for DLL compilation
---
 src/Makefile           |  21 +++++----------------
 src/raylib.dll.rc.data | Bin 11182 -> 11246 bytes
 src/raylib.rc.data     | Bin 11182 -> 11182 bytes
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index f50c61113..0c5f9d6bf 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
index 7ade4486b70d469b67a9f42b3b717047948b8a6c..0c1e2dae84e8f7050efc1339f89b197c453cdf74 100644
GIT binary patch
delta 145
zcmZ1%{w|!;hmny11a3^^l;*V1W?--Za!NMp1~W09*xbmZt;Tp_@>&gjZbk-XusR?;
z`J;yTBux$$1_lkL$y}OBOe{>3^)xpz8cu$wY0RiMSyZc9-j0Erfsw(Vp@<=qAsvYG
m7!nzB7~FuY9EMbeyvhGHMcMTjQh>ai$=zD9K)o-ujsgJZFCh*9

delta 101
zcmaDCzAl{8hmny11ZGU+l;-@Q#lT<#<d|&K4Q68O*xbmZt;X0fd98*%Hv<DRSRIg_
x{82-Ek|qZW1H%i($y}OBOh*_e>uGLcG?@HQ)0i=SvZz+|<O^C6K)$B-Q2?5p87u$*

diff --git a/src/raylib.rc.data b/src/raylib.rc.data
index 81e7452292ec16ac58c71280a2af41e0265b88ed..30f2c58318f8df6771e4c214ce2d341df44e6b80 100644
GIT binary patch
delta 43
wcmZ1%zAk*j9Sv?q24)5j0Me5`YKTwL<e1E+d5O_*^G!{DMn=QQFSU*W00cq|fB*mh

delta 43
vcmZ1%zAk*j9Sv><24)5bV4nO@Lwu4Z$7D9mON<7aZ));0G8#;NsdW?p1M>`g