Merge pull request #7 from jet082/master

Fix segfaults across all cores and allow ios-arm64

Makefile.libretro

@@ -61,9 +61,14 @@ else ifneq (,$(findstring ios,$(platform)))
 	ifeq ($(IOSSDK),)
 		IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
 	endif
-
-	CC = cc -arch armv7 -isysroot $(IOSSDK)
-	CXX = c++ -arch armv7 -isysroot $(IOSSDK)
+	ifeq ($(platform),ios-arm64)
+		CC = cc -arch arm64 -isysroot $(IOSSDK)
+		CXX = c++ -arch arm64 -isysroot $(IOSSDK)
+		CXXFLAGS += -stdlib=libc++
+	else
+		CC = cc -arch armv7 -isysroot $(IOSSDK)
+		CXX = c++ -arch armv7 -isysroot $(IOSSDK)
+	endif
 	COMMONFLAGS += -DIOS
 ifeq ($(platform),ios9)
 	CC += -miphoneos-version-min=8.0

uzem_libretro.cpp

@@ -72,7 +72,7 @@ void retro_init(void)
 	uzebox.idrv = &input_driver_libretro;
 	uzebox.vdrv = &video_driver_libretro;
 
-   uzebox.vdrv->framebuffer = framebuffer;
+   //uzebox.vdrv->framebuffer = framebuffer;
    uzebox.vdrv->stride = 720;
 
 	uzebox.init_gui();
@@ -270,7 +270,7 @@ void retro_run(void)
 
 	/* Try rendering straight into VRAM if we can. */
 
-   /*
+
 	struct retro_framebuffer fb = {0};
 	fb.width = width;
 	fb.height = height;
@@ -282,7 +282,7 @@ void retro_run(void)
 		uzebox.vdrv->framebuffer = framebuffer;
 		uzebox.vdrv->stride = width;
 	}
-   */
+
 
 	while (uzebox.scanline_count == -999)
 		uzebox.exec();