From 93355dd5330fa1a6734b7ee89dcf840b556f1d02 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Mon, 27 Jul 2015 17:25:19 +0200 Subject: [PATCH] Merge gcwz into Linux Makefile --- shell/gcwz/Makefile | 124 ------------------- shell/linux/Makefile | 14 +++ shell/{ => linux}/gcwz/default.gcw0.desktop | 0 shell/{ => linux}/gcwz/enta_viv/libEGL.so | Bin shell/{ => linux}/gcwz/enta_viv/libGLESv2.so | Bin shell/{ => linux}/gcwz/enta_viv/libdrm.so | Bin shell/{ => linux}/gcwz/enta_viv/libglapi.so | Bin shell/{ => linux}/gcwz/icon-32.png | Bin 8 files changed, 14 insertions(+), 124 deletions(-) delete mode 100644 shell/gcwz/Makefile rename shell/{ => linux}/gcwz/default.gcw0.desktop (100%) rename shell/{ => linux}/gcwz/enta_viv/libEGL.so (100%) rename shell/{ => linux}/gcwz/enta_viv/libGLESv2.so (100%) rename shell/{ => linux}/gcwz/enta_viv/libdrm.so (100%) rename shell/{ => linux}/gcwz/enta_viv/libglapi.so (100%) rename shell/{ => linux}/gcwz/icon-32.png (100%) diff --git a/shell/gcwz/Makefile b/shell/gcwz/Makefile deleted file mode 100644 index 1f7e3dc29..000000000 --- a/shell/gcwz/Makefile +++ /dev/null @@ -1,124 +0,0 @@ - -LOCAL_PATH := $(call my-dir) -FOR_LINUX :=1 -NOT_ARM := 1 -NO_REC := 1 -#NO_REND := 1 -USE_ALSA := 1 -#USE_OSS := 1 -#USE_PULSEAUDIO := 1 - -RZDCY_SRC_DIR = ../../core - -include $(RZDCY_SRC_DIR)/core.mk - -CC_PREFIX ?= /opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc- - -CXX=${CC_PREFIX}g++ -CC=${CC_PREFIX}gcc -AS=${CC_PREFIX}as -STRIP=${CC_PREFIX}strip - -LD=${CC} - -MFLAGS := -#-marm -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp -funroll-loops -ASFLAGS := -#-march=armv7-a -mfpu=neon -mfloat-abi=softfp - -LDFLAGS := -g -Wl,-Map,$(notdir $@).map,--gc-sections -Wl,-O3 -Wl,--sort-common - -SOURCES := cfg/ hw/arm7/ hw/aica/ hw/asic/ hw/ hw/gdrom/ hw/maple/ \ - hw/mem/ hw/pvr/ hw/sh4/ hw/sh4/rec_v2/ plugins/ profiler/ serial_ipc/ \ - hw/extdev/ hw/arm/ imgread/ linux/ linux-dist/ ./ rec-ARM/ deps/zlib/ deps/chdr/ deps/crypto/ arm_emitter/ - - -CXXFLAGS := -g -O3 -D RELEASE -c -D TARGET_GCW0 -D USES_HOMEDIR -D TARGET_NO_REC #-D NO_REND -CXXFLAGS += -frename-registers -fno-strict-aliasing -fsingle-precision-constant -CXXFLAGS += -ffast-math -ftree-vectorize -#-fprefetch-loop-arrays -#-std=c++0x - -CXXFLAGS += $(CFLAGS) $(MFLAGS) -fno-exceptions -fno-rtti -#CXXFLAGS += -D SUPPORT_X11 - - -ifdef PGO_MAKE - CXXFLAGS += -fprofile-generate -pg - LDFLAGS += -fprofile-generate -else - CXXFLAGS += -fomit-frame-pointer -endif - -ifdef PGO_USE - CXXFLAGS += -fprofile-use -endif - - -ifdef LTO_TEST - CXXFLAGS += -flto -fwhole-program - LDFLAGS +=-flto -fwhole-program -endif - -INCS := -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos -I../linux-deps/include - -LIBS := -L../linux-deps/lib -L./enta_viv -LIBS += -lglapi -LIBS += -lm -lrt -ldl -lEGL -lGLESv2 #-lglslcompiler -lIMGegl -lpvr2d -lsrv_um -LIBS += -lpthread #-lX11 -lXdmcp -lXau - -ifdef USE_ALSA - CXXFLAGS += -D USE_ALSA - LIBS += -lasound -endif - -ifdef USE_OSS - CXXFLAGS += -D USE_OSS -endif - -ifdef USE_PULSEAUDIO - CXXFLAGS += -D USE_PULSEAUDIO - LIBS += -lpulse-simple -endif - - -OBJECTS=$(RZDCY_FILES:.cpp=.build_obj) -OBJECTS:=$(OBJECTS:.c=.build_obj) -OBJECTS:=$(OBJECTS:.S=.build_obj) -OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,obj/%,$(OBJECTS)) - - -PACKAGE=reicast-gcwz.opk -EXECUTABLE_STRIPPED=nosym-reicast.elf -EXECUTABLE_TARBZ=reicast.tar.bz2 -EXECUTABLE=reicast.elf - -PACKAGE_FILES=$(EXECUTABLE_STRIPPED) default.gcw0.desktop icon-32.png - -all: $(CPPFILES) $(EXECUTABLE) $(EXECUTABLE_STRIPPED) $(PACKAGE) - -$(PACKAGE): $(PACKAGE_FILES) - mksquashfs $(PACKAGE_FILES) $(PACKAGE) -all-root - -$(EXECUTABLE): $(OBJECTS) - echo $(RZDCY_FILES) - $(CXX) $(MFLAGS) $(EXTRAFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ - -$(EXECUTABLE_STRIPPED): $(EXECUTABLE) - cp $< $@ && $(STRIP) $@ - -obj/%.build_obj : $(RZDCY_SRC_DIR)/%.cpp - mkdir -p $(dir $@) - $(CXX) $(EXTRAFLAGS) $(INCS) $(CXXFLAGS) $< -o $@ - -obj/%.build_obj : $(RZDCY_SRC_DIR)/%.c - mkdir -p $(dir $@) - $(CC) $(EXTRAFLAGS) $(INCS) $(CXXFLAGS) $< -o $@ - -obj/%.build_obj : $(RZDCY_SRC_DIR)/%.S - mkdir -p $(dir $@) - $(AS) $(ASFLAGS) $(INCS) $< -o $@ - - -clean: - rm $(OBJECTS) $(EXECUTABLE) -f diff --git a/shell/linux/Makefile b/shell/linux/Makefile index 3aa7e4049..cc7ac07b2 100644 --- a/shell/linux/Makefile +++ b/shell/linux/Makefile @@ -37,6 +37,8 @@ ifeq (,$(platform)) else $(error Unsupported Hardware) endif + else ifneq (,$(findstring mips,$(ARCH))) + platform = gcwz else $(error Unsupported CPU architecture) endif @@ -89,6 +91,15 @@ else ifneq (,$(findstring pandora,$(platform))) ASFLAGS += -march=armv7-a -mfpu=neon -mfloat-abi=softfp CFLAGS += -D TARGET_PANDORA -D WEIRD_SLOWNESS +# GCW Zero +else ifneq (,$(findstring gcwz,$(platform))) + NOT_ARM := 1 + NO_REC := 1 + CC_PREFIX ?= /opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc- + CFLAGS += -D TARGET_GCW0 -D TARGET_NO_REC + LIBS += -L../linux-deps/lib -L./enta_viv -lglapi + GCWZ_PKG = reicast-gcwz.opk + GCWZ_PKG_FILES = gcwz/default.gcw0.desktop gcwz/icon-32.png else $(error Unknown platform) endif @@ -175,6 +186,9 @@ EXECUTABLE_STRIPPED=nosym-reicast.elf EXECUTABLE=reicast.elf all: $(CPPFILES) $(EXECUTABLE) $(EXECUTABLE_STRIPPED) +ifneq (,$(findstring gcwz,$(platform))) + mksquashfs $(EXECUTABLE_STRIPPED) $(GCWZ_PKG_FILES) $(GCWZ_PKG) -all-root +endif $(EXECUTABLE): $(OBJECTS) $(CXX) $(MFLAGS) $(EXTRAFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ diff --git a/shell/gcwz/default.gcw0.desktop b/shell/linux/gcwz/default.gcw0.desktop similarity index 100% rename from shell/gcwz/default.gcw0.desktop rename to shell/linux/gcwz/default.gcw0.desktop diff --git a/shell/gcwz/enta_viv/libEGL.so b/shell/linux/gcwz/enta_viv/libEGL.so similarity index 100% rename from shell/gcwz/enta_viv/libEGL.so rename to shell/linux/gcwz/enta_viv/libEGL.so diff --git a/shell/gcwz/enta_viv/libGLESv2.so b/shell/linux/gcwz/enta_viv/libGLESv2.so similarity index 100% rename from shell/gcwz/enta_viv/libGLESv2.so rename to shell/linux/gcwz/enta_viv/libGLESv2.so diff --git a/shell/gcwz/enta_viv/libdrm.so b/shell/linux/gcwz/enta_viv/libdrm.so similarity index 100% rename from shell/gcwz/enta_viv/libdrm.so rename to shell/linux/gcwz/enta_viv/libdrm.so diff --git a/shell/gcwz/enta_viv/libglapi.so b/shell/linux/gcwz/enta_viv/libglapi.so similarity index 100% rename from shell/gcwz/enta_viv/libglapi.so rename to shell/linux/gcwz/enta_viv/libglapi.so diff --git a/shell/gcwz/icon-32.png b/shell/linux/gcwz/icon-32.png similarity index 100% rename from shell/gcwz/icon-32.png rename to shell/linux/gcwz/icon-32.png