aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile18
-rw-r--r--source/gfx.c1
2 files changed, 11 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index b63037b..845cb24 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ include $(THEOS)/makefiles/common.mk
LIBRARY_NAME = $(TARGET_NAME)_libretro_ios
else ifeq ($(platform), qnx)
- TARGET := $(TARGET_NAME)_libretro_qnx.so
+ TARGET := $(TARGET_NAME)_libretro_$(platform).so
fpic := -fPIC
SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
CC = qcc -Vgcc_ntoarmv7le
@@ -121,7 +121,7 @@ else ifeq ($(platform), qnx)
# PS3
else ifeq ($(platform), ps3)
- TARGET := $(TARGET_NAME)_libretro_ps3.a
+ TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
@@ -141,7 +141,7 @@ else ifeq ($(platform), sncps3)
# PSP1
else ifeq ($(platform), psp1)
- TARGET := $(TARGET_NAME)_libretro_psp1.a
+ TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = psp-gcc$(EXE_EXT)
CXX = psp-g++$(EXE_EXT)
AR = psp-ar$(EXE_EXT)
@@ -157,7 +157,7 @@ else ifeq ($(platform), psp1)
# Vita
else ifeq ($(platform), vita)
- TARGET := $(TARGET_NAME)_libretro_vita.a
+ TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = arm-vita-eabi-gcc$(EXE_EXT)
CXX = arm-vita-eabi-g++$(EXE_EXT)
AR = arm-vita-eabi-ar$(EXE_EXT)
@@ -168,7 +168,7 @@ else ifeq ($(platform), vita)
# CTR (3DS)
else ifeq ($(platform), ctr)
- TARGET := $(TARGET_NAME)_libretro_ctr.a
+ TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
@@ -182,7 +182,7 @@ else ifeq ($(platform), ctr)
# Nintendo Game Cube
else ifeq ($(platform), ngc)
- TARGET := $(TARGET_NAME)_libretro_ngc.a
+ TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
@@ -190,12 +190,16 @@ else ifeq ($(platform), ngc)
# Nintendo Wii
else ifeq ($(platform), wii)
- TARGET := $(TARGET_NAME)_libretro_wii.a
+ TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
STATIC_LINKING = 1
+else ifeq ($(platform), emscripten)
+ TARGET := $(TARGET_NAME)_libretro_$(platform).bc
+ STATIC_LINKING = 1
+
# GCW0
else ifeq ($(platform), gcw0)
TARGET := $(TARGET_NAME)_libretro.so
diff --git a/source/gfx.c b/source/gfx.c
index a0880e6..437ea97 100644
--- a/source/gfx.c
+++ b/source/gfx.c
@@ -100,7 +100,6 @@
#define M7 19
#define M8 19
-void output_png();
void ComputeClipWindows();
extern uint8_t BitShifts[8][4];