Merge pull request #11577 from libretro/remove_wk

[VITA] Remove old threading workaround
libretro · Nov 15, 2020 · 0d2b9fe · 0d2b9fe
2 parents 7eb349b + c5f2375
commit 0d2b9fe
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 232 deletions.
diff --git a/Makefile.vita b/Makefile.vita
@@ -95,7 +95,7 @@ AR      := $(PREFIX)ar
 OBJCOPY := $(PREFIX)objcopy
 STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
-LD      := $(CC)
+LD      := $(CXX)
 
 LIBDIRS := -L.
 
@@ -132,7 +132,7 @@ CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
 VITA_LIBS := -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub -lSceAppUtil_stub \
 	-lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceTouch_stub -lSceAudio_stub \
 	-lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub -lSceMotion_stub \
-	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lstdc++ -lpthread -lpng -lz -lvitaGL -lvitashark -lSceShaccCg_stub
+	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lpthread -lpng -lz -lvitaGL -lvitashark -lSceShaccCg_stub
 
 LIBS	:= $(WHOLE_START) -lretro_vita $(WHOLE_END) $(VITA_LIBS) -lm -lc
 

diff --git a/bootstrap/vita/threading.c b/bootstrap/vita/threading.c
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
@@ -30,7 +30,6 @@
 #include <psp2/apputil.h>
 
 #include "../../bootstrap/vita/sbrk.c"
-#include "../../bootstrap/vita/threading.c"
 
 #else
 #include <pspkernel.h>