Merge branch 'alpha' into fix_macos_building

Author: einsteinx2

CMakeLists.txt

@@ -50,6 +50,7 @@ set(d_core ${reicast_core_path})
 message(${d_core})
 
 file(GLOB_RECURSE hw_SRCS	${d_core}/hw/*.cpp			${d_core}/hw/*.h)
+file(GLOB_RECURSE lxdream_SRCS	${d_core}/gpl/lxdream/*.cpp			${d_core}/gpl/lxdream/*.h)
 
 file(GLOB cfg_SRCS			${d_core}/cfg/*.cpp			${d_core}/cfg/*.h)
 file(GLOB rend_SRCS			${d_core}/rend/*.cpp		${d_core}/rend/*.h)
@@ -77,6 +78,7 @@ if(${HOST_OS} EQUAL ${OS_WINDOWS})
 endif()
 
 set(core_SRCS
+  ${lxdream_SRCS}
   ${hw_SRCS}
   ${cfg_SRCS}
   ${rend_SRCS}
@@ -147,9 +149,11 @@ endif()
 ### deps.cmake #################################################################################
 
 set(d_deps ${reicast_core_path}/deps)
+set(gpl_deps ${reicast_core_path}/gpl/deps)
+
 include_directories ("${d_deps}")
-include_directories ("${d_deps}/picotcp/include")
-include_directories ("${d_deps}/picotcp/modules")
+include_directories ("${gpl_deps}/picotcp/include")
+include_directories ("${gpl_deps}/picotcp/modules")
 
 file(GLOB xbyak_H	${d_deps}/xbyak/*.h)		# include headers into cmake target/project view 
 
@@ -166,8 +170,8 @@ file(GLOB crypt_SRCS ${d_deps}/crypto/*.cpp)
 file(GLOB imgui_SRCS ${d_deps}/imgui/*.cpp)
 file(GLOB lua_SRCS   ${d_deps}/lua/*.c)
 
-file(GLOB picoModS   ${d_deps}/picotcp/modules/*.c)
-file(GLOB picoStkS   ${d_deps}/picotcp/stack/*.c)
+file(GLOB picoModS   ${gpl_deps}/picotcp/modules/*.c)
+file(GLOB picoStkS   ${gpl_deps}/picotcp/stack/*.c)
 set(pico_SRCS ${picoModS} ${picoStkS})
 
 set(deps_SRCS
@@ -179,7 +183,7 @@ set(deps_SRCS
   ${crypt_SRCS}
   ${imgui_SRCS}
   ${lua_SRCS}
-  ${d_deps}/xbrz/xbrz.cpp
+  ${gpl_deps}/xbrz/xbrz.cpp
   ${d_deps}/xxhash/xxhash.c
   ${d_deps}/cdipsr/cdipsr.cpp
   ${d_deps}/coreio/coreio.cpp
@@ -273,6 +277,9 @@ add_executable(${TNAME}${binSuffix} ${reicast_SRCS} ${deps_SRCS})
 target_compile_features(${TNAME}${binSuffix} PRIVATE cxx_std_14)
 
 if(${HOST_OS} EQUAL ${OS_LINUX})
+  # needed for opentty
+  target_link_libraries(${TNAME} -lutil)
+
   find_package(ALSA)
   if(ALSA_FOUND)
     target_compile_definitions(${TNAME} PUBLIC USE_ALSA)

LICENSE

@@ -1,3 +1,10 @@
+By reading this license agreement you commit to be a decent human being in
+all your daily interactions for the rest of your life.
+
+<><<<<< <><<< <><< ><> <>< >><> >>><> >>>>><>
+
+Reicast is under the
+
 BSD 3-Clause License
 
 Copyright (c) 2003-2020, Reicast Team and Contributors

README.md

@@ -172,12 +172,20 @@
 #define LICENSE_LGPL 0x50000002
 #define LICENSE_GPL  0x50000003
 
+//FEAT_TA
+#define TA_HLE 0x60000001
+#define TA_LLE 0x60000002
+
 //automatic
 
 #if !defined(TARGET_LICENSE)
 #define TARGET_LICENSE LICENSE_GPL
 #endif
 
+#if !defined(FEAT_TA)
+#define FEAT_TA TA_HLE
+#endif
+
 #ifndef CMAKE_BUILD
 
 #if defined(_WIN32) && !defined(TARGET_WIN86) && !defined(TARGET_WIN64)
@@ -316,6 +324,10 @@
 	#define FEAT_HAS_SOFTREND BUILD_COMPILER == COMPILER_VC	//GCC wants us to enable sse4 globaly to enable intrins
 #endif
 
+#ifndef FEAT_HAS_SERIAL_TTY
+    #define FEAT_HAS_SERIAL_TTY (HOST_OS == OS_LINUX && !defined(_ANDROID))
+#endif
+
 //Depricated build configs
 #ifdef HOST_NO_REC
 #error Dont use HOST_NO_REC

libswirl/build.h

@@ -10,7 +10,7 @@ VERSION_HEADER := $(RZDCY_SRC_DIR)/version.h
 RZDCY_MODULES	:=	cfg/ hw/arm7/ hw/aica/ hw/holly/ hw/ hw/gdrom/ hw/maple/ \
  hw/mem/ hw/pvr/ hw/sh4/ hw/sh4/interpr/ hw/sh4/modules/ plugins/ profiler/ oslib/ \
  hw/extdev/ hw/arm/ hw/naomi/ imgread/ ./ deps/coreio/ deps/zlib/ deps/chdr/ deps/crypto/ \
- deps/libelf/ deps/cdipsr/ arm_emitter/ rend/ reios/ deps/libpng/ deps/xbrz/ \
+ deps/libelf/ deps/cdipsr/ arm_emitter/ rend/ reios/ deps/libpng/ gpl/deps/xbrz/ \
  deps/xxhash/ deps/libzip/ deps/imgui/ archive/ input/ utils/ utils/glwrap/ gui/
 
 ifdef SCRIPTING
@@ -117,8 +117,8 @@ RZDCY_CFLAGS += -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/rend/gles -I$(RZDCY_SRC_DI
 		 -I$(RZDCY_SRC_DIR)/deps/vixl -I$(RZDCY_SRC_DIR)/khronos
 
 ifdef USE_MODEM
-	RZDCY_CFLAGS += -DENABLE_MODEM -I$(RZDCY_SRC_DIR)/deps/picotcp/include -I$(RZDCY_SRC_DIR)/deps/picotcp/modules
-	RZDCY_MODULES += hw/modem/ deps/picotcp/modules/ deps/picotcp/stack/
+	RZDCY_CFLAGS += -DENABLE_MODEM -I$(RZDCY_SRC_DIR)/gpl/deps/picotcp/include -I$(RZDCY_SRC_DIR)/gpl/deps/picotcp/modules
+	RZDCY_MODULES += hw/modem/ gpl/deps/picotcp/modules/ gpl/deps/picotcp/stack/
 endif
 
 ifdef NO_REC