Update Makefile; update Emscripten target

Makefile.libretro

@@ -93,20 +93,24 @@ THEOS_BUILD_DIR := objs
 include $(THEOS)/makefiles/common.mk
 
 LIBRARY_NAME = $(TARGET_NAME)_libretro_ios
+
+# QNX
 else ifeq ($(platform), qnx)
 	EXT?=so
-	TARGET := $(TARGET_NAME)_libretro_qnx.$(EXT)
+	TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
    fpic := -fPIC
    SHARED := -shared -Wl,--no-undefined
+
+# Emscripten
 else ifeq ($(platform), emscripten)
 	EXT?=bc
-   TARGET := $(TARGET_NAME)_libretro_emscripten.$(EXT)
-   fpic := -fPIC
-   SHARED := -shared -Wl,--no-undefined
+   TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
+	STATIC_LINKING = 1
+
 # PS3
 else ifeq ($(platform), ps3)
 	EXT=a
-	TARGET := $(TARGET_NAME)_libretro_ps3.$(EXT)
+	TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
 	CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
 	CC_AS = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
 	AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
@@ -126,7 +130,7 @@ else ifeq ($(platform), sncps3)
 # Lightweight PS3 Homebrew SDK
 else ifeq ($(platform), psl1ght)
 	EXT=a
-	TARGET := $(TARGET_NAME)_libretro_psl1ght.$(EXT)
+	TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
 	CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
 	CC_AS = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
 	AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
@@ -136,7 +140,7 @@ else ifeq ($(platform), psl1ght)
 # PSP
 else ifeq ($(platform), psp1)
 	EXT=a
-   TARGET := $(TARGET_NAME)_libretro_psp1.$(EXT)
+   TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
    CC = psp-gcc$(EXE_EXT)
    AR = psp-ar$(EXE_EXT)
    PLATFORM_DEFINES := -DPSP -G0
@@ -145,7 +149,7 @@ else ifeq ($(platform), psp1)
 # Vita
 else ifeq ($(platform), vita)
 	EXT=a
-   TARGET := $(TARGET_NAME)_libretro_vita.$(EXT)
+   TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
 	CC = arm-vita-eabi-gcc$(EXE_EXT)
 	AR = arm-vita-eabi-ar$(EXE_EXT)
    PLATFORM_DEFINES := -DVITA
@@ -154,7 +158,7 @@ else ifeq ($(platform), vita)
 # CTR (3DS)
 else ifeq ($(platform), ctr)
 	EXT=a
-	TARGET := $(TARGET_NAME)_libretro_ctr.$(EXT)
+	TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
 	CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
 	AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
 	CFLAGS += -DARM11 -D_3DS
@@ -167,7 +171,7 @@ else ifeq ($(platform), ctr)
 # Nintendo Game Cube
 else ifeq ($(platform), ngc)
 	EXT=a
-	TARGET := $(TARGET_NAME)_libretro_ngc.$(EXT)
+	TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
 	CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
 	CC_AS = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
 	AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
@@ -177,7 +181,7 @@ else ifeq ($(platform), ngc)
 # Nintendo Wii
 else ifeq ($(platform), wii)
 	EXT=a
-	TARGET := $(TARGET_NAME)_libretro_wii.$(EXT)
+	TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
 	CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
 	CC_AS = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
 	AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)