Merge pull request #2 from libretro/master

rebase
libretro · Sep 6, 2019 · 85129b8 · 85129b8
2 parents 4e4559d + c1f7d09
commit 85129b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -202,7 +202,7 @@ else ifeq ($(platform), classic_armv8_a35)
 else ifeq ($(platform), emscripten)
 	TARGET := $(TARGET_NAME)_libretro_emscripten.bc
 else
-   CC = gcc
+   CC ?= gcc
    TARGET := $(TARGET_NAME)_libretro.dll
    SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -lwinmm -Wl,--no-undefined
 	LIBS += -lwinmm -lws2_32

diff --git a/jni/Application.mk b/jni/Application.mk
@@ -1,2 +1,2 @@
-APP_STL := gnustl_static 
+APP_STL := c++_static 
 APP_ABI := all