diff options
| author | Twinaphex | 2019-09-14 08:05:21 +0200 |
|---|---|---|
| committer | GitHub | 2019-09-14 08:05:21 +0200 |
| commit | 98c87e0d4288464d56fe80bb7a0f1dfc8fd7d2ff (patch) | |
| tree | f2efe42eb26880ee204354d73a946058c3240a4a | |
| parent | 8454df2117d57a6644e832c2d05e51b80740f788 (diff) | |
| parent | 4cf9eb99e3a2b6bb527ba115b068ad17bcbc827b (diff) | |
| download | snes9x2002-98c87e0d4288464d56fe80bb7a0f1dfc8fd7d2ff.tar.gz snes9x2002-98c87e0d4288464d56fe80bb7a0f1dfc8fd7d2ff.tar.bz2 snes9x2002-98c87e0d4288464d56fe80bb7a0f1dfc8fd7d2ff.zip | |
Merge pull request #35 from webgeek1234/master
Fix mingw cross compile and android compile on ndk r20
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | jni/Application.mk | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -297,7 +297,7 @@ CFLAGS += -D_CRT_SECURE_NO_DEPRECATE NO_GCC = 1 else TARGET := $(TARGET_NAME)_libretro.dll - CC = gcc + CC ?= gcc fpic := SHARED := -shared -Wl,--no-undefined -Wl,--version-script=libretro/link.T LD_FLAGS += -static-libgcc -static-libstdc++ -lwinmm diff --git a/jni/Application.mk b/jni/Application.mk index 81ea664..a252a72 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,2 +1 @@ APP_ABI := all -NDK_TOOLCHAIN_VERSION := 4.9 |