diff --git a/Makefile.ctr b/Makefile.ctr index 5e5f210307..d3923330c8 100644 --- a/Makefile.ctr +++ b/Makefile.ctr @@ -52,7 +52,7 @@ ifeq ($(GRIFFIN_BUILD), 1) OBJ += griffin/griffin.o DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB - DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DHAVE_SOCKET_LEGACY -DHAVE_THREADS + DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_SOCKET_LEGACY -DHAVE_THREADS #-DHAVE_SSL -DMBEDTLS_SSL_DEBUG_ALL #ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file else diff --git a/Makefile.ps3 b/Makefile.ps3 index 16f731e05f..c2270132d2 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -112,7 +112,7 @@ PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe -DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS +DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS -DRC_DISABLE_LUA #DEFINES += -DHAVE_IMAGEVIEWER diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index 0e0dbb9b40..84351cad95 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -82,7 +82,7 @@ DEFINES += -DHAVE_7ZIP DEFINES += -DHAVE_SL ifeq ($(HAVE_CHEEVOS),1) -DEFINES += -DHAVE_CHEEVOS +DEFINES += -DHAVE_CHEEVOS -DRC_DISABLE_LUA endif DEFINES += -DFLAC_PACKAGE_VERSION="\"retroarch\"" -DHAVE_LROUND -DFLAC__HAS_OGG=0 diff --git a/pkg/android/phoenix64/jni/Android.mk b/pkg/android/phoenix64/jni/Android.mk index f3f35187f3..0f58999d6c 100644 --- a/pkg/android/phoenix64/jni/Android.mk +++ b/pkg/android/phoenix64/jni/Android.mk @@ -81,7 +81,7 @@ endif DEFINES += -DHAVE_7ZIP ifeq ($(HAVE_CHEEVOS),1) -DEFINES += -DHAVE_CHEEVOS +DEFINES += -DHAVE_CHEEVOS -DRC_DISABLE_LUA endif DEFINES += -DHAVE_SL diff --git a/pkg/apple/RetroArch.xcodeproj/project.pbxproj b/pkg/apple/RetroArch.xcodeproj/project.pbxproj index c5ff22ac34..a6cb029d2c 100644 --- a/pkg/apple/RetroArch.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch.xcodeproj/project.pbxproj @@ -516,6 +516,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_IOHIDMANAGER", "-DHAVE_CORETEXT", @@ -579,6 +580,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_IOHIDMANAGER", "-DHAVE_CORETEXT", diff --git a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj index 5a259d7481..a7643d2152 100644 --- a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj @@ -341,6 +341,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -427,6 +428,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -480,6 +482,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -567,6 +570,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -638,6 +642,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", diff --git a/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj index 2787c03b58..fbc4f7413e 100644 --- a/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj @@ -349,6 +349,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -434,6 +435,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -486,6 +488,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -572,6 +575,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -642,6 +646,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", diff --git a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj index c14dc332eb..d83a5f8d63 100644 --- a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj @@ -341,6 +341,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -428,6 +429,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -482,6 +484,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -570,6 +573,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -641,6 +645,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", diff --git a/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj index 7514a48fa3..c161f1728e 100644 --- a/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj @@ -348,6 +348,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -433,6 +434,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -485,6 +487,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -571,6 +574,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -641,6 +645,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", diff --git a/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj index c3623971b5..4e542c6909 100644 --- a/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj @@ -353,6 +353,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORETEXT", "-DHAVE_CORELOCATION", @@ -436,6 +437,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -485,6 +487,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -567,6 +570,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -637,6 +641,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", diff --git a/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj index 098b7c5766..386b08d978 100644 --- a/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj @@ -355,6 +355,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -425,6 +426,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -501,6 +503,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -587,6 +590,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -639,6 +643,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", diff --git a/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj index 6def3a6b4d..c713aba2e8 100644 --- a/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj @@ -370,6 +370,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -454,6 +455,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -505,6 +507,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -591,6 +594,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -661,6 +665,7 @@ "-DHAVE_UPDATE_ASSETS", "-DHAVE_LANGEXTRA", "-DHAVE_CHEEVOS", + "-DRC_DISABLE_LUA", "-DHAVE_IMAGEVIEWER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI",