Merge LinCPP Makefile into Linux Makefile

shell/linCPP/Makefile

@@ -1,122 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-FOR_LINUX :=1
-NOT_ARM := 1
-CPP_REC := 1
-#NO_REC := 1
-#NO_REND := 1
-WEBUI :=1 
-USE_ALSA := 1
-USE_OSS := 1
-#USE_PULSEAUDIO := 1
-
-RZDCY_SRC_DIR = ../../core
-
-include $(RZDCY_SRC_DIR)/core.mk
-
-
-CXX=${CC_PREFIX}g++
-CC=${CC_PREFIX}gcc
-AS=${CC_PREFIX}as
-STRIP=${CC_PREFIX}strip
-
-LD=${CC}
-
-MFLAGS := #-m32
-#-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 
-
-CFLAGS :=  -g -O3  -D RELEASE -c -D TARGET_LINUX_x64 -D USES_HOMEDIR -D TARGET_NO_JIT
-CFLAGS += -D SUPPORT_X11
-CFLAGS += -frename-registers -fno-strict-aliasing #-fsingle-precision-constant 
-CFLAGS += -ffast-math -ftree-vectorize 
-
-
-#-fprefetch-loop-arrays 
-#-std=c++0x
-CXXFLAGS += $(CFLAGS) $(MFLAGS) -fexceptions -fno-rtti -fpermissive -std=gnu++11
-CXXFLAGS += -D SUPPORT_X11 
-CXXFLAGS += -fno-operator-names
-
-ifdef PGO_MAKE
-	CFLAGS += -fprofile-generate -pg
-	LDFLAGS	+= -fprofile-generate
-else
-	CFLAGS += -fomit-frame-pointer
-endif
-
-ifdef PGO_USE
-	CFLAGS += -fprofile-use
-endif
-
-
-ifdef LTO_TEST
-	CFLAGS += -flto -fwhole-program 
-	LDFLAGS +=-flto -fwhole-program 
-endif
-
-INCS	:= -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos
-
-LIBS    := # use system libs
-LIBS    += -lm -lrt -ldl
-LIBS    += -lpthread -lX11
-
-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
-
-ifdef USE_GLES
-	CXXFLAGS += -DGLES
-	LIBS	+= -lEGL -lGLESv2
-else
-	LIBS	+= -ldl -lGL #for desktop gl
-endif
-
-
-OBJECTS=$(RZDCY_FILES:.cpp=.build_obj)
-OBJECTS:=$(OBJECTS:.c=.build_obj)
-OBJECTS:=$(OBJECTS:.S=.build_obj)
-OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,obj/%,$(OBJECTS))
-
-
-EXECUTABLE_STRIPPED=nosym-reicast.elf
-EXECUTABLE=reicast.elf
-
-PACKAGE_FILES=$(EXECUTABLE_STRIPPED) default.gcw0.desktop icon-32.png
-
-all: $(CPPFILES) $(EXECUTABLE) $(EXECUTABLE_STRIPPED)
-	
-$(EXECUTABLE): $(OBJECTS)
-	$(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) $(CFLAGS) $(CXXFLAGS) $< -o $@
-	
-obj/%.build_obj : $(RZDCY_SRC_DIR)/%.c
-	mkdir -p $(dir $@)
-	$(CC) $(EXTRAFLAGS) $(INCS) $(CFLAGS) $< -o $@
-
-obj/%.build_obj : $(RZDCY_SRC_DIR)/%.S
-	mkdir -p $(dir $@)	
-	$(AS) $(ASFLAGS) $(INCS) $< -o $@
-
-
-clean:
-	rm $(OBJECTS) $(EXECUTABLE) -f

shell/linux/Makefile

@@ -59,22 +59,29 @@ ifneq (,$(findstring x86,$(platform)))
     MFLAGS += -m32
     ASFLAGS += -32
     LDFLAGS += -m32
-    CFLAGS += -m32 -D TARGET_LINUX_x86 -D TARGET_NO_AREC
+    CFLAGS += -m32 -D TARGET_LINUX_x86 -D TARGET_NO_AREC -fsingle-precision-constant
     CXXFLAGS += -fno-exceptions
 
 # Generic 64 bit x86 (a.k.a. x64/AMD64/x86_64/Intel64/EM64T)
 else ifneq (,$(findstring x64,$(platform)))
     X64_REC := 1
     NOT_ARM := 1
-    CFLAGS += -D TARGET_LINUX_x64 -D TARGET_NO_AREC
+    CFLAGS += -D TARGET_LINUX_x64 -D TARGET_NO_AREC -fsingle-precision-constant
     CXXFLAGS += -fexceptions
 
+# LinCPP
+else ifneq (,$(findstring lincpp,$(platform)))
+    CPP_REC := 1
+    NOT_ARM := 1
+    CFLAGS += -D TARGET_LINUX_x64 -D TARGET_NO_JIT
+    CXXFLAGS += -fexceptions -std=gnu++11
+
 # Raspberry Pi 2
 else ifneq (,$(findstring rpi2,$(platform)))
     AS=${CC_PREFIX}gcc
     MFLAGS += -marm -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard -funroll-loops
     ASFLAGS += -march=armv7-a -mfpu=neon -mfloat-abi=softfp
-    CFLAGS += -D TARGET_BEAGLE -D TARGET_LINUX_ARMELv7 -DARM_HARDFP
+    CFLAGS += -D TARGET_BEAGLE -D TARGET_LINUX_ARMELv7 -DARM_HARDFP -fsingle-precision-constant
     INCS += -I/opt/vc/include/ -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads -I../linux-deps/include
     LIBS += -L/opt/vc/lib/  -L../linux-deps/lib -lbcm_host
     USE_GLES := 1
@@ -84,7 +91,7 @@ else ifneq (,$(findstring beagle,$(platform)))
     CC_PREFIX ?= arm-none-linux-gnueabi-
     MFLAGS += -marm -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp -funroll-loops
     ASFLAGS := -march=armv7-a -mfpu=neon -mfloat-abi=softfp
-    CFLAGS += -D TARGET_BEAGLE
+    CFLAGS += -D TARGET_BEAGLE -fsingle-precision-constant
     USE_GLES := 1
 
 # Pandora
@@ -95,14 +102,14 @@ else ifneq (,$(findstring pandora,$(platform)))
     USE_GLES := 1
     MFLAGS +== -marm -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -funroll-loops -fpermissive
     ASFLAGS += -march=armv7-a -mfpu=neon -mfloat-abi=softfp
-    CFLAGS += -D TARGET_PANDORA  -D WEIRD_SLOWNESS
+    CFLAGS += -D TARGET_PANDORA  -D WEIRD_SLOWNESS -fsingle-precision-constant
 
 # 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
+    CFLAGS += -D TARGET_GCW0 -D TARGET_NO_REC -fsingle-precision-constant
     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
@@ -116,7 +123,7 @@ include $(RZDCY_SRC_DIR)/core.mk
 LDFLAGS += -g -Wl,-Map,$(notdir $@).map,--gc-sections -Wl,-O3 -Wl,--sort-common
 
 CFLAGS += -g -O3 -D RELEASE -c -D USES_HOMEDIR #-D NO_REND
-CFLAGS += -frename-registers -fno-strict-aliasing -fsingle-precision-constant 
+CFLAGS += -frename-registers -fno-strict-aliasing
 CFLAGS += -ffast-math -ftree-vectorize
 
 CXXFLAGS += -fno-rtti -fpermissive -fno-operator-names