Merge pull request #147 from OpenDriver2/develop-SoapyMan

RC1 fixes

Author: SoapyMan

.appveyor/Install.sh

@@ -9,7 +9,7 @@ curl "$linux_premake_url" -Lo premake5.tar.gz
 tar xvf premake5.tar.gz
 
 sudo apt-get update -qq -y
-sudo apt-get install --no-install-recommends -y g++-7-multilib gcc-7-multilib
+sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib
 sudo apt-get install -qq aptitude -y
 
 # fix Ubuntu's broken mess of packages using aptitude

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src_rebuild/PsyCross"]
+	path = src_rebuild/PsyCross
+	url = https://github.com/OpenDriver2/PsyCross.git

PSXToolchain/CDSrc/licensea.dat

@@ -0,0 +1,2 @@
+mkpsxiso.exe redriver2_cd.xml -y
+pause

PSXToolchain/CDSrc/pack.bat

@@ -0,0 +1,2 @@
+dumpsxiso.exe Driver2CD2.bin -s CD.xml
+pause

PSXToolchain/CDSrc/redriver2_cd.xml

@@ -1,3 +1,5 @@
+echo off
+cls
 set REDRIVER_FOLDER=%cd%\..
 
 rem Make a symlink

PSXToolchain/CDSrc/unpack.bat

@@ -16,18 +16,20 @@ environment:
   project_folder: '%APPVEYOR_BUILD_FOLDER%\\src_rebuild'
   dependency_folder: '%APPVEYOR_BUILD_FOLDER%\dependencies'
   # Dependency URLs
-  windows_premake_url: 'https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-windows.zip'
+  windows_premake_url: 'https://github.com/premake/premake-core/releases/download/v5.0.0-beta1/premake-5.0.0-beta1-windows.zip'
   windows_jpeg_url: 'http://www.ijg.org/files/jpegsr9d.zip'
   windows_openal_url: 'https://openal-soft.org/openal-binaries/openal-soft-1.21.1-bin.zip'
-  windows_sdl2_url: 'https://www.libsdl.org/release/SDL2-devel-2.0.14-VC.zip'
-  linux_premake_url: 'https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-linux.tar.gz'
+  windows_sdl2_url: 'https://www.libsdl.org/release/SDL2-devel-2.0.20-VC.zip'
+  linux_premake_url: 'https://github.com/premake/premake-core/releases/download/v5.0.0-beta1/premake-5.0.0-beta1-linux.tar.gz'
   # Dependency Directories
   windows_jpeg_dir: '%dependency_folder%\jpeg-9d'
   windows_openal_dir: '%dependency_folder%\openal-soft-1.21.1-bin'
-  windows_sdl2_dir: '%dependency_folder%\SDL2-2.0.14'
+  windows_sdl2_dir: '%dependency_folder%\SDL2-2.0.20'
 
 
 install:
+  - git submodule init
+  - git submodule update
   - cmd: '%APPVEYOR_BUILD_FOLDER%\.appveyor\Install.bat'
   - sh: '${APPVEYOR_BUILD_FOLDER}/.appveyor/Install.sh'
 

PSXToolchain/psx_build.bat

@@ -97,7 +97,7 @@ start=w
 select=H
 
 [cdfs]
-image=install/Driver2CD1.bin
+#image=install/Driver2CD1.bin
 mode=1,2,2352			# track, mode, sector size. DO NOT MODIFY
 
 [pad]
@@ -107,7 +107,10 @@ pad2device=-1			# player 2 controller device; -1 for automatic assignment
 [render]
 windowWidth=1280
 windowHeight=720
-fullscreen=0			# enable full screen mode; it takes screen resolution
+fullscreen=0			# enable full screen mode
+screenWidth=1280		# screen resolution when fullscreen is on
+screenHeight=720
+vsync=1				# Prevents screen tearing in Full screen. Turn it off if you have framerate problems.
 pgxpTextureMapping=1
 bilinearFiltering=1		# "smooth" textures
 pgxpZbuffer=1			# full Z-buffer on PSX polygons
@@ -121,5 +124,4 @@ freeCamera=1			# Press F7 in game to enable
 fastLoadingScreens=1
 widescreenOverlays=1		# set 1 to see map, bars and stats aligned to screen corners
 driver1music=0			# put Driver 1's MUSIC.BIN as D1MUSIC.BIN to DRIVER2\SOUNDS folder
-overrideContent=0		# this enables texture and car model modding
-userChases=RacingFreak,Snoopi,Olanov,Vortex,Fireboyd78
+overrideContent=0		# this enables texture and car model modding