From 55cb5c94d419b17ff6863ddfd72e165ae787f75f Mon Sep 17 00:00:00 2001
From: Stefanos Kornilios Mitsis Poiitidis <skmp@nillware.com>
Date: Mon, 20 Jan 2014 23:10:17 +0200
Subject: [PATCH] Fix gcw and nacl makefiles abit

---
 shell/gcwz/Makefile |  4 ++--
 shell/nacl/Makefile | 30 +++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/shell/gcwz/Makefile b/shell/gcwz/Makefile
index 49959056d..3b44f604a 100644
--- a/shell/gcwz/Makefile
+++ b/shell/gcwz/Makefile
@@ -5,9 +5,9 @@ NOT_ARM := 1
 NO_REC := 1
 #NO_REND := 1
 
-RZDCY_SRC_DIR = ../../newdc
+RZDCY_SRC_DIR = ../../core
 
-include $(RZDCY_SRC_DIR)/newdc.mk
+include $(RZDCY_SRC_DIR)/core.mk
 
 CC_PREFIX ?= /opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-
 
diff --git a/shell/nacl/Makefile b/shell/nacl/Makefile
index 81b1ad950..183567757 100644
--- a/shell/nacl/Makefile
+++ b/shell/nacl/Makefile
@@ -1,14 +1,21 @@
-PROJECT:=razdecy
+
+LOCAL_PATH := $(call my-dir)
+FOR_LINUX :=1
+NOT_ARM := 1
+NO_REC := 1
+#NO_REND := 1
+
+RZDCY_SRC_DIR = ../../core
+
+include $(RZDCY_SRC_DIR)/core.mk
+
+PROJECT:=reicast
 LDFLAGS:=-lppapi_gles2 -lppapi_cpp -lppapi
-SOURCES	:=	../src/cfg/ ../src/hw/arm7/ ../src/hw/aica/ ../src/hw/asic/ ../src/hw/ ../src/hw/gdrom/ ../src/hw/maple/ \
- ../src/hw/mem/ ../src/hw/pvr/ ../src/hw/sh4/ ../src/hw/sh4/rec_v2/ ../src/plugins/ ../src/profiler/ ../src/serial_ipc/ \
- ../src/hw/extdev/ ../src/hw/arm/ ../src/imgread/ \
- ../src/nacl/ ../src/ ../src/deps/zlib/ ../src/deps/chdr/ ../src/deps/crypto/ ../src/arm_emitter/ 
 
 
-CXX_SOURCES := $(foreach dir,$(SOURCES),$(wildcard $(dir)*.cpp))
+#CXX_SOURCES := $(foreach dir,$(SOURCES),$(wildcard $(dir)*.cpp))
 
-CC_SOURCES += $(foreach dir,$(SOURCES),$(wildcard $(dir)*.c))
+#CC_SOURCES += $(foreach dir,$(SOURCES),$(wildcard $(dir)*.c))
 
 
 
@@ -16,7 +23,7 @@ CC_SOURCES += $(foreach dir,$(SOURCES),$(wildcard $(dir)*.c))
 WARNINGS:=-Wno-long-long -Wall -Wswitch-enum -pedantic
 CXXFLAGS:=-pthread -std=gnu++98 $(WARNINGS)
 
-CXXFLAGS	+= -I../src/ -I../src.khronos -I../linux-deps/include -D RELEASE -D HOST_NO_REC -D TARGET_NACL32
+CXXFLAGS	+= -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos -I../linux-deps/include -D RELEASE -D HOST_NO_REC -D TARGET_NACL32
 
 #
 # Compute tool paths
@@ -38,15 +45,16 @@ export CYGWIN
 all: $(PROJECT)_x86_32.nexe
 
 # Define 32 bit compile and link rules for C++ sources
-CXX_32_OBJS:=$(patsubst %.cpp,%.nacl_86x32_build_obj,$(CXX_SOURCES))
+CXX_32_OBJS:=$(RZDCY_FILES)
+#$(patsubst %.cpp,%.nacl_86x32_build_obj,$(CXX_SOURCES))
 #CC_32_OBJS:=$(patsubst %.c,%.build_obj_nacl_32,$(CC_SOURCES))
 
 x86_32_OBJS:=$(CXX_32_OBJS) $(CC_32_OBJS)
 
-%.nacl_86x32_build_obj : %.cpp $(THIS_MAKE)
+%.o : %.cpp $(THIS_MAKE)
 	$(CXX) -o $@ -c $< -m32 -O0 -g $(CXXFLAGS)
 	
-%.nacl_86x32_build_obj : %.c $(THIS_MAKE)
+%.o : %.c $(THIS_MAKE)
 	$(CC) -o $@ -c $< -m32 -O0 -g $(CXXFLAGS)
 
 $(PROJECT)_x86_32.nexe : $(x86_32_OBJS)