Merge pull request #91 from meepingsnesroms/tungstenT3Support

Disable OpenMP on libretro for now
meepingsnesroms · Jun 9, 2019 · 33f7cb8 · 33f7cb8
2 parents d0ccc71 + 51e405f
commit 33f7cb8
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 deletions.
diff --git a/libretroBuildSystem/build/Makefile.common b/libretroBuildSystem/build/Makefile.common
@@ -82,16 +82,16 @@ endif
 
 # use all CPUs and optimize for the most likely outcome, Android is handled separately
 # Apple broke OpenMP in there port of Clang so no Mac OS or iOS
-ifneq (,$(call CHECK_ALL,$(this_system),windows linux))
-   # none of libretros MSVC compilers work with these optimizations for multiple different reasons
-   # they dont have the library "VCOMP.lib"
-   # they are too old for the extension to exist
-   # MSVC never has or will support __builtin_expect
-   ifeq (,$(findstring msvc,$(this_system)))
-      COREDEFINES += -fopenmp -DEMU_MULTITHREADED -DEMU_MANAGE_HOST_CPU_PIPELINE
-      LDFLAGS += -fopenmp
-   endif
-endif
+# ifneq (,$(call CHECK_ALL,$(this_system),windows mingw linux))
+#    # none of libretros MSVC compilers work with these optimizations for multiple different reasons
+#    # they dont have the library "VCOMP.lib"
+#    # they are too old for the extension to exist
+#    # MSVC never has or will support __builtin_expect
+#    ifeq (,$(findstring msvc,$(this_system)))
+#       COREDEFINES += -fopenmp -DEMU_MULTITHREADED -DEMU_MANAGE_HOST_CPU_PIPELINE
+#       LDFLAGS += -fopenmp
+#    endif
+# endif
 
 # use C++11
 ifeq ($(EMU_SUPPORT_PALM_OS5), 1)

diff --git a/libretroBuildSystem/build/Makefile.windows_x86 b/libretroBuildSystem/build/Makefile.windows_x86
@@ -44,8 +44,8 @@ platform       = win
 PLATDEFS       = 
 PLATCFLAGS     = -fstrict-aliasing
 PLATCXXFLAGS   = -fstrict-aliasing
-PLATLDFLAGS    = -shared -lm
-PLATLDXFLAGS   = -shared -lm
+PLATLDFLAGS    = -shared -lm -static-libgcc -static-libstdc++
+PLATLDXFLAGS   = -shared -lm -static-libgcc -static-libstdc++
 
 ################
 # libretro setup

diff --git a/libretroBuildSystem/build/Makefile.windows_x86_64 b/libretroBuildSystem/build/Makefile.windows_x86_64
@@ -44,8 +44,8 @@ platform       = win
 PLATDEFS       = 
 PLATCFLAGS     = -fpic -fstrict-aliasing
 PLATCXXFLAGS   = -fpic -fstrict-aliasing
-PLATLDFLAGS    = -shared -lm
-PLATLDXFLAGS   = -shared -lm
+PLATLDFLAGS    = -shared -lm -static-libgcc -static-libstdc++
+PLATLDXFLAGS   = -shared -lm -static-libgcc -static-libstdc++
 
 ################
 # libretro setup

diff --git a/libretroBuildSystem/jni/Android.mk b/libretroBuildSystem/jni/Android.mk
@@ -32,8 +32,10 @@ endif
 include $(CLEAR_VARS)
 LOCAL_MODULE    := retro
 LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_CXX) $(SOURCES_ASM)
-LOCAL_CFLAGS    := $(COREFLAGS) -fopenmp -DEMU_MULTITHREADED -DEMU_MANAGE_HOST_CPU_PIPELINE
-LOCAL_LDFLAGS   := -Wl,-version-script=$(CORE_DIR)/build/link.T -fopenmp
+# LOCAL_CFLAGS    := $(COREFLAGS) -fopenmp -DEMU_MULTITHREADED -DEMU_MANAGE_HOST_CPU_PIPELINE
+# LOCAL_LDFLAGS   := -Wl,-version-script=$(CORE_DIR)/build/link.T -fopenmp
+LOCAL_CFLAGS    := $(COREFLAGS)
+LOCAL_LDFLAGS   := -Wl,-version-script=$(CORE_DIR)/build/link.T
 
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
 	LOCAL_ARM_NEON := true

diff --git a/libretroBuildSystem/libretro.c b/libretroBuildSystem/libretro.c
@@ -242,7 +242,7 @@ void retro_set_environment(retro_environment_t cb){
    struct retro_input_descriptor input_desc[] = {
       { 0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Touchscreen Mouse X" },
       { 0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Touchscreen Mouse Y" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R,                             "Touchscreen Mouse Click" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R,                              "Touchscreen Mouse Click" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,                             "Dpad Up" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,                           "Dpad Down" },
 #if defined(EMU_SUPPORT_PALM_OS5)

diff --git a/roadmap.txt b/roadmap.txt
@@ -21,7 +21,9 @@ RetroArch GUI:
 *now launches content like cartridge based systems
 *make default button layout match default controller layout better
 //TODO: allow adding more content after boot
+//TODO: switch to high contrast and top left corner aligned mouse cursors
 //TODO: get EMU_MANAGE_HOST_CPU_PIPELINE working on other platforms then the main 4
+//TODO: get OpenMP working with RetroArch
 //TODO: when compiling with "make platform=windows_x86_64" the dll wont load(theres a really good chance its because "libgomp-1.dll"(the OpenMP handler library) is missing from the RetroArch folder)
 *allow disabling the silkscreen area
 *booting without game works again
@@ -30,6 +32,7 @@ RetroArch GUI:
 Qt GUI:
 //TODO: get circleci builds for QT port on Win/Mac/Linux
 //TODO: allow reiniting the emu without closing the program
+//TODO: render with OpenGL widget(should be a major speed boost)
 *fixed state manager not loading until a state is saved
 *boot button uses install button icon now, changed install button to icon a "+"
 *put back left/right/center keys