diff options
| author | notaz | 2012-12-10 23:41:06 +0200 |
|---|---|---|
| committer | notaz | 2012-12-10 23:41:06 +0200 |
| commit | 3601e36bd526c63c842f68b2ff6cac82954e5e7e (patch) | |
| tree | cc959168ba476f626440b60c4b93e1a5c83f3c4b /jni/Android.mk | |
| parent | f29fbd5358e28135d389e2218da7c90f8b94b983 (diff) | |
| parent | cc4f9b703ba166301a31ef6c695e1d02572e6bc4 (diff) | |
| download | pcsx_rearmed-3601e36bd526c63c842f68b2ff6cac82954e5e7e.tar.gz pcsx_rearmed-3601e36bd526c63c842f68b2ff6cac82954e5e7e.tar.bz2 pcsx_rearmed-3601e36bd526c63c842f68b2ff6cac82954e5e7e.zip | |
Merge branch 'libretro'
Conflicts:
frontend/libretro.c
Diffstat (limited to 'jni/Android.mk')
| -rw-r--r-- | jni/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 89af335..06b4379 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -89,7 +89,7 @@ LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c # libretro LOCAL_SRC_FILES += ../frontend/libretro.c -LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND +LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include LOCAL_LDLIBS := -lz -llog |