Skip to content

GitLab

Unverified Commit c27261af authored by Libretro-Admin's avatar Libretro-Admin Committed by GitHub
Browse files

Merge pull request #31 from Sanaki/patch-1 

Fix explicit CC/CXX settings breaking Windows build
parents 9b21e1b3 a0490e7f
Pipeline #16816 passed with stages
in 2 minutes and 54 seconds
Hide whitespace changes
Inline Side-by-side
Makefile.libretro
View file @ c27261af
...@@ -331,9 +331,9 @@ else ifneq (,$(findstring armv,$(platform))) ...@@ -331,9 +331,9 @@ else ifneq (,$(findstring armv,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC fpic := -fPIC
SHARED := -shared -Wl,-version-script=build/link.T SHARED := -shared -Wl,-version-script=build/link.T
CC = gcc CC ?= gcc
CC_AS = gcc CC_AS ?= gcc
CXX = g++ CXX ?= g++
ifneq (,$(findstring cortexa8,$(platform))) ifneq (,$(findstring cortexa8,$(platform)))
PLATFORM_DEFINES += -marm -mcpu=cortex-a8 PLATFORM_DEFINES += -marm -mcpu=cortex-a8
else ifneq (,$(findstring cortexa9,$(platform))) else ifneq (,$(findstring cortexa9,$(platform)))
...@@ -386,9 +386,9 @@ else ifeq ($(platform), vita) ...@@ -386,9 +386,9 @@ else ifeq ($(platform), vita)
# Windows # Windows
else else
TARGET := $(TARGET_NAME)_libretro.dll TARGET := $(TARGET_NAME)_libretro.dll
CC = gcc CC ?= gcc
CC_AS = gcc CC_AS ?= gcc
CXX = g++ CXX ?= g++
SHARED := -shared -static-libgcc -static-libstdc++ -Wl,-no-undefined -Wl,-version-script=build/link.T SHARED := -shared -static-libgcc -static-libstdc++ -Wl,-no-undefined -Wl,-version-script=build/link.T
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment