diff --git a/Makefile.griffin b/Makefile.griffin
new file mode 100644
index 0000000000..2844bcdb7d
--- /dev/null
+++ b/Makefile.griffin
@@ -0,0 +1,163 @@
+DEBUG			               = 0
+HAVE_LOGGER		            = 0
+HAVE_FILE_LOGGER	         = 0
+PERF_TEST		            = 0
+WHOLE_ARCHIVE_LINK         = 0
+BIG_STACK		            = 0
+PC_DEVELOPMENT_IP_ADDRESS	= 192.168.1.138
+PC_DEVELOPMENT_UDP_PORT		= 3490
+
+ifneq ($(EMSCRIPTEN),)
+   platform = emscripten
+endif
+
+ifeq ($(platform),)
+platform = unix
+ifeq ($(shell uname -a),)
+   platform = win
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   platform = osx
+else ifneq ($(findstring win,$(shell uname -a)),)
+   platform = win
+endif
+endif
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+TARGET_NAME := retroarch
+
+INCLUDE :=
+LDFLAGS :=
+LIBDIRS := 
+
+ifeq ($(platform), ngc)
+  CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+  CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
+  LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
+  ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
+  DOL_TARGET := retroarch_ngc.dol
+  ELF_TARGET := retroarch_ngc.elf
+  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/rzlib
+  LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube -L.
+  MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float
+  LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
+ifeq ($(BIG_STACK), 1)
+   LDFLAGS += -T gx/ld/ogc.ld
+endif
+  LIBS := -lfat $(WHOLE_START) -lretro_ngc $(WHOLE_END) -logc
+ifeq ($(HAVE_LOGGER), 1)
+  LIBS += -lbba
+endif
+  PLATCFLAGS := -DGEKKO
+
+  HAVE_THREADS := 1
+else ifeq ($(platform), wii)
+  CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+  CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
+  LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
+  ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
+  DOL_TARGET := retroarch_wii.dol
+  ELF_TARGET := retroarch_wii.elf
+  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/rzlib
+  LIBDIRS += -L$(DEVKITPRO)/libogc/lib/wii -L.
+  MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
+  LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,strdup,-wrap,strndup,-wrap,malloc_usable_size
+ifeq ($(BIG_STACK), 1)
+   LDFLAGS += -T gx/ld/rvl.ld
+endif
+  LIBS := -lfat $(WHOLE_START) -lretro_wii $(WHOLE_END) -logc -lwiiuse -lbte 
+  APP_BOOTER_DIR = wii/app_booter
+  PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
+  PLATCFLAGS := -DGEKKO -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC
+
+  HAVE_THREADS := 1
+  HAVE_RSOUND  := 1
+endif
+
+CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+
+OBJ = griffin/griffin.o  $(PLATOBJS)
+
+ifeq ($(PERF_TEST), 1)
+   CFLAGS += -DPERF_TEST
+endif
+
+ifeq ($(HAVE_LOGGER), 1)
+CFLAGS		+= -DHAVE_LOGGER
+CFLAGS      += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+CFLAGS      += -Iconsole/logger
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+CFLAGS          += -Iconsole/logger
+endif
+
+
+CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DRARCH_CONSOLE  -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -Wno-char-subscripts  -DRARCH_INTERNAL
+
+ifeq ($(HAVE_THREADS), 1)
+CFLAGS += -DHAVE_THREADS
+endif
+
+ifeq ($(HAVE_RSOUND), 1)
+CFLAGS += -DHAVE_RSOUND
+endif
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g -DDEBUG
+else
+   CFLAGS += -O3
+endif
+
+all: $(DOL_TARGET)
+
+%.dol: %.elf
+	$(ELF2DOL) $< $@
+
+$(ELF_TARGET): $(OBJ)
+	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+%.bmpobj: %.bmp
+	$(LD) -r -b binary -o $@ $<
+
+%.binobj: %.bin
+	$(LD) -r -b binary -o $@ $<
+
+$(APP_BOOTER_DIR)/app_booter.bin:
+	$(MAKE) -C $(APP_BOOTER_DIR)
+
+pkg: all
+ifeq ($(platform), wii)
+	cp -r $(DOL_TARGET) wii/pkg/CORE.dol
+else ifeq ($(platform), ngc)
+	cp -r $(DOL_TARGET) ngc/pkg/CORE.dol
+endif
+
+clean:
+	rm -f $(DOL_TARGET)
+	rm -f $(ELF_TARGET)
+	rm -f $(OBJ)
+ifeq ($(platform), wii)
+	$(MAKE) -C $(APP_BOOTER_DIR) clean
+endif
+
+.PHONY: clean
diff --git a/Makefile.ngc b/Makefile.ngc
deleted file mode 100644
index 9cfb1fd1e1..0000000000
--- a/Makefile.ngc
+++ /dev/null
@@ -1,99 +0,0 @@
-RARCH_VERSION		= "0.9.9.3"
-
-DEBUG			= 0
-HAVE_LOGGER		= 0
-HAVE_FILE_LOGGER	= 0
-PERF_TEST		= 0
-WHOLE_ARCHIVE_LINK	= 0
-BIG_STACK		= 0
-
-PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
-PC_DEVELOPMENT_UDP_PORT		= 3490
-
-# system platform
-system_platform = unix
-ifeq ($(shell uname -a),)
-EXE_EXT = .exe
-   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   system_platform = win
-endif
-
-CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
-LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
-ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
-
-DOL_TARGET := retroarch_ngc.dol
-ELF_TARGET := retroarch_ngc.elf
-
-INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ideps/rzlib
-LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
-
-MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float
-CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
-ifeq ($(BIG_STACK), 1)
-   LDFLAGS += -T gx/ld/ogc.ld
-endif
-LIBS := -lfat $(WHOLE_START) -lretro_ngc $(WHOLE_END) -logc
-
-OBJ = griffin/griffin.o
-
-ifeq ($(PERF_TEST), 1)
-   CFLAGS += -DPERF_TEST
-endif
-
-ifeq ($(HAVE_LOGGER), 1)
-CFLAGS		+= -DHAVE_LOGGER
-CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-CFLAGS          += -Iconsole/logger
-LIBS += -lbba
-endif
-
-ifeq ($(HAVE_FILE_LOGGER), 1)
-CFLAGS		+= -DHAVE_FILE_LOGGER
-CFLAGS          += -Iconsole/logger
-endif
-
-CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DRARCH_CONSOLE -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DHAVE_THREADS -Wno-char-subscripts -DRARCH_INTERNAL
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g
-else
-   CFLAGS += -O3
-endif
-
-all: $(DOL_TARGET)
-
-%.dol: %.elf
-	$(ELF2DOL) $< $@
-
-$(ELF_TARGET): $(OBJ)
-	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-%.binobj: %.bin
-	$(LD) -r -b binary -o $@ $<
-
-%.bmpobj: %.bmp
-	$(LD) -r -b binary -o $@ $<
-
-pkg: all
-	cp -r $(DOL_TARGET) ngc/pkg/CORE.dol
-
-clean:
-	rm -f $(DOL_TARGET)
-	rm -f $(ELF_TARGET)
-	rm -f $(OBJ)
-
-.PHONY: clean
-
diff --git a/Makefile.wii b/Makefile.wii
deleted file mode 100644
index 455935952e..0000000000
--- a/Makefile.wii
+++ /dev/null
@@ -1,104 +0,0 @@
-RARCH_VERSION		= "0.9.9.3"
-
-DEBUG			= 0
-HAVE_LOGGER		= 0
-HAVE_FILE_LOGGER	= 0
-PERF_TEST		= 0
-WHOLE_ARCHIVE_LINK	= 0
-BIG_STACK		= 0
-
-PC_DEVELOPMENT_IP_ADDRESS	= 192.168.1.138
-PC_DEVELOPMENT_UDP_PORT		= 3490
-
-# system platform
-system_platform = unix
-ifeq ($(shell uname -a),)
-EXE_EXT = .exe
-   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   system_platform = win
-endif
-
-CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
-LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
-ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
-
-DOL_TARGET := retroarch_wii.dol
-ELF_TARGET := retroarch_wii.elf
-
-INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/ogc -Ideps/rzlib
-LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
-
-MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
-CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,strdup,-wrap,strndup,-wrap,malloc_usable_size
-ifeq ($(BIG_STACK), 1)
-   LDFLAGS += -T gx/ld/rvl.ld
-endif
-LIBS := -lfat $(WHOLE_START) -lretro_wii $(WHOLE_END) -logc -lwiiuse -lbte 
-APP_BOOTER_DIR = wii/app_booter
-
-OBJ = griffin/griffin.o $(APP_BOOTER_DIR)/app_booter.binobj
-
-ifeq ($(PERF_TEST), 1)
-   CFLAGS += -DPERF_TEST
-endif
-
-ifeq ($(HAVE_LOGGER), 1)
-CFLAGS		+= -DHAVE_LOGGER
-CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-CFLAGS          += -Iconsole/logger
-endif
-
-ifeq ($(HAVE_FILE_LOGGER), 1)
-CFLAGS		+= -DHAVE_FILE_LOGGER
-CFLAGS          += -Iconsole/logger
-endif
-
-
-CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DHAVE_THREADS -DHAVE_RSOUND -Wno-char-subscripts  -DRARCH_INTERNAL
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g -DDEBUG
-else
-   CFLAGS += -O3
-endif
-
-all: $(DOL_TARGET)
-
-%.dol: %.elf
-	$(ELF2DOL) $< $@
-
-$(ELF_TARGET): $(OBJ)
-	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-%.bmpobj: %.bmp
-	$(LD) -r -b binary -o $@ $<
-
-%.binobj: %.bin
-	$(LD) -r -b binary -o $@ $<
-
-$(APP_BOOTER_DIR)/app_booter.bin:
-	$(MAKE) -C $(APP_BOOTER_DIR)
-
-pkg: all
-	cp -r $(DOL_TARGET) wii/pkg/CORE.dol
-
-clean:
-	rm -f $(DOL_TARGET)
-	rm -f $(ELF_TARGET)
-	rm -f $(OBJ)
-	$(MAKE) -C $(APP_BOOTER_DIR) clean
-
-.PHONY: clean
-