From 678104e18766c244773d1f2a0479ea4099a9fd89 Mon Sep 17 00:00:00 2001 From: AndresSM Date: Sun, 16 Mar 2014 23:17:04 -0500 Subject: [PATCH 1/7] add mess, mess-tiny, mame-tiny targets --- libretro-build-common.sh | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/libretro-build-common.sh b/libretro-build-common.sh index 833cc9c7..408a8843 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -348,6 +348,48 @@ build_libretro_mame() { fi } +build_libretro_mame_tiny() { + cd "${BASE_DIR}" + if [ -d 'libretro-mame' ]; then + echo '=== Building MAME ===' + cd libretro-mame/0152 + + "${MAKE}" -f Makefile.libretro "TARGET=mame" "SUBTARGET=tiny" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MESS' + "${MAKE}" -f Makefile.libretro "TARGET=mame" "SUBTARGET=tiny" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MESS' + cp "mame_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}\\mame_tiny_libretro${FORMAT}.${FORMAT_EXT}" + else + echo 'MAME not fetched, skipping ...' + fi +} + +build_libretro_mess() { + cd "${BASE_DIR}" + if [ -d 'libretro-mame' ]; then + echo '=== Building MESS ===' + cd libretro-mame/0152 + + "${MAKE}" -f Makefile.libretro "TARGET=mess" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MESS' + "${MAKE}" -f Makefile.libretro "TARGET=mess" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MESS' + cp "mess_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" + else + echo 'MAME not fetched, skipping ...' + fi +} + +build_libretro_mess_tiny() { + cd "${BASE_DIR}" + if [ -d 'libretro-mame' ]; then + echo '=== Building MESS ===' + cd libretro-mame/0152 + + "${MAKE}" -f Makefile.libretro "TARGET=mess" "SUBTARGET=tiny" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MESS' + "${MAKE}" -f Makefile.libretro "TARGET=mess" "SUBTARGET=tiny" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MESS' + cp "mess_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}\\mess_tiny_libretro${FORMAT}.${FORMAT_EXT}" + else + echo 'MAME not fetched, skipping ...' + fi +} + build_libretro_vbam() { cd "${BASE_DIR}" if [ -d 'libretro-vbam' ]; then From 2d00345026a194d94b31f368a4d59e48967f8e53 Mon Sep 17 00:00:00 2001 From: AndresSM Date: Sun, 16 Mar 2014 23:40:30 -0500 Subject: [PATCH 2/7] add ume --- libretro-build-common.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libretro-build-common.sh b/libretro-build-common.sh index d68d6092..0285dd13 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -376,6 +376,20 @@ build_libretro_mess() { fi } +build_libretro_ume() { + cd "${BASE_DIR}" + if [ -d 'libretro-mame' ]; then + echo '=== Building UME ===' + cd libretro-mame/0152 + + "${MAKE}" -f Makefile.libretro "TARGET=ume" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MESS' + "${MAKE}" -f Makefile.libretro "TARGET=ume" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MESS' + cp "mess_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" + else + echo 'MAME not fetched, skipping ...' + fi +} + build_libretro_mess_tiny() { cd "${BASE_DIR}" if [ -d 'libretro-mame' ]; then From 9f58baa8f5caf4158648fd24e2dd9f76e479732a Mon Sep 17 00:00:00 2001 From: AndresSM Date: Sun, 16 Mar 2014 23:45:02 -0500 Subject: [PATCH 3/7] fix libretro.dll name --- libretro-build-common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretro-build-common.sh b/libretro-build-common.sh index 0285dd13..3946d102 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -384,7 +384,7 @@ build_libretro_ume() { "${MAKE}" -f Makefile.libretro "TARGET=ume" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MESS' "${MAKE}" -f Makefile.libretro "TARGET=ume" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MESS' - cp "mess_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" + cp "ume_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" else echo 'MAME not fetched, skipping ...' fi From e6201b582929efb748c86b401a7131e60128e570 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 17 Mar 2014 13:31:11 +0100 Subject: [PATCH 4/7] (MSVC) Update libretro-build-win.sh --- libretro-build-common-xdk.sh | 14 ++ libretro-build-win.sh | 3 + libretro-stella/msvc/msvc-2003-xbox1.bat | 47 ---- libretro-stella/msvc/msvc-2010-360.bat | 124 ---------- libretro-stella/msvc/msvc-2010.bat | 124 ---------- libretro-stella/msvc/msvc-2010.sln | 20 -- .../msvc/msvc-2010/msvc-2010.vcxproj | 141 ------------ .../msvc/msvc-2010/msvc-2010.vcxproj.filters | 211 ------------------ 8 files changed, 17 insertions(+), 667 deletions(-) delete mode 100644 libretro-stella/msvc/msvc-2003-xbox1.bat delete mode 100644 libretro-stella/msvc/msvc-2010-360.bat delete mode 100644 libretro-stella/msvc/msvc-2010.bat delete mode 100644 libretro-stella/msvc/msvc-2010.sln delete mode 100644 libretro-stella/msvc/msvc-2010/msvc-2010.vcxproj delete mode 100644 libretro-stella/msvc/msvc-2010/msvc-2010.vcxproj.filters diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh index abaf36ee..910e4576 100644 --- a/libretro-build-common-xdk.sh +++ b/libretro-build-common-xdk.sh @@ -206,6 +206,20 @@ build_libretro_prboom() fi } +build_libretro_stella() +{ + cd $BASE_DIR + if [ -d "libretro-stella" ]; then + echo "=== Building Stella ===" + cd libretro-stella + cd msvc + cmd.exe /k $MSVC_NAME.bat + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/stella_libretro$FORMAT.$FORMAT_EXT + else + echo "Stella not fetched, skipping ..." + fi +} + build_libretro_nestopia() { cd $BASE_DIR diff --git a/libretro-build-win.sh b/libretro-build-win.sh index 714adab5..e849385a 100644 --- a/libretro-build-win.sh +++ b/libretro-build-win.sh @@ -34,7 +34,10 @@ else build_libretro_gambatte build_libretro_nx build_libretro_prboom + build_libretro_stella + #build_libretro_quicknes build_libretro_nestopia build_libretro_tyrquake build_libretro_mame078 + #build_libretro_handy fi diff --git a/libretro-stella/msvc/msvc-2003-xbox1.bat b/libretro-stella/msvc/msvc-2003-xbox1.bat deleted file mode 100644 index 91d69ff5..00000000 --- a/libretro-stella/msvc/msvc-2003-xbox1.bat +++ /dev/null @@ -1,47 +0,0 @@ -@SET VSINSTALLDIR=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE -@SET VCINSTALLDIR=C:\Program Files\Microsoft Visual Studio .NET 2003 -@SET FrameworkDir=C:\WINDOWS\Microsoft.NET\Framework -@SET FrameworkVersion=v1.1.4322 -@SET FrameworkSDKDir=C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1 -@rem Root of Visual Studio common files. - -@if "%VSINSTALLDIR%"=="" goto Usage -@if "%VCINSTALLDIR%"=="" set VCINSTALLDIR=%VSINSTALLDIR% - -@rem -@rem Root of Visual Studio ide installed files. -@rem -@set DevEnvDir=%VSINSTALLDIR% - -@rem -@rem Root of Visual C++ installed files. -@rem -@set MSVCDir=%VCINSTALLDIR%\VC7 - -@rem -@echo Setting environment for using Microsoft Visual Studio .NET 2003 tools. -@echo (If you have another version of Visual Studio or Visual C++ installed and wish -@echo to use its tools from the command line, run vcvars32.bat for that version.) -@rem - -@REM %VCINSTALLDIR%\Common7\Tools dir is added only for real setup. - -@set PATH=%DevEnvDir%;%MSVCDir%\BIN;%VCINSTALLDIR%\Common7\Tools;%VCINSTALLDIR%\Common7\Tools\bin\prerelease;%VCINSTALLDIR%\Common7\Tools\bin;%FrameworkSDKDir%\bin;%FrameworkDir%\%FrameworkVersion%;%PATH%; -@set INCLUDE=%MSVCDir%\ATLMFC\INCLUDE;%MSVCDir%\INCLUDE;%FrameworkSDKDir%\include;%INCLUDE%;%XDK%\xbox\include -@set LIB=%MSVCDir%\ATLMFC\LIB;%MSVCDir%\LIB;%MSVCDir%\PlatformSDK\lib;%XDK%\lib;%XDK%\xbox\lib;%LIB% - -@goto end - -:Usage - -@echo. VSINSTALLDIR variable is not set. -@echo. -@echo SYNTAX: %0 - -@goto end - -:end - -devenv /clean Release_LTCG msvc-2003-xbox1.sln -devenv /build Release_LTCG msvc-2003-xbox1.sln -exit diff --git a/libretro-stella/msvc/msvc-2010-360.bat b/libretro-stella/msvc/msvc-2010-360.bat deleted file mode 100644 index 3ca14052..00000000 --- a/libretro-stella/msvc/msvc-2010-360.bat +++ /dev/null @@ -1,124 +0,0 @@ -@echo off - -@echo Setting environment for using Microsoft Visual Studio 2010 x86 tools. - -@call :GetVSCommonToolsDir -@if "%VS100COMNTOOLS%"=="" goto error_no_VS100COMNTOOLSDIR - -@call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" 32bit No64bit - -@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR -@if "%FrameworkDir32%"=="" goto error_no_FrameworkDIR32 -@if "%FrameworkVersion32%"=="" goto error_no_FrameworkVer32 -@if "%Framework35Version%"=="" goto error_no_Framework35Version - -@set FrameworkDir=%FrameworkDir32% -@set FrameworkVersion=%FrameworkVersion32% - -@if not "%WindowsSdkDir%" == "" ( - @set "PATH=%WindowsSdkDir%bin\NETFX 4.0 Tools;%WindowsSdkDir%bin;%PATH%" - @set "INCLUDE=%WindowsSdkDir%include;%INCLUDE%" - @set "LIB=%WindowsSdkDir%lib;%LIB%" -) - -@rem -@rem Root of Visual Studio IDE installed files. -@rem -@set DevEnvDir=%VSINSTALLDIR%Common7\IDE\ - -@rem PATH -@rem ---- -@if exist "%VSINSTALLDIR%Team Tools\Performance Tools" ( - @set "PATH=%VSINSTALLDIR%Team Tools\Performance Tools;%PATH%" -) -@if exist "%ProgramFiles%\HTML Help Workshop" set PATH=%ProgramFiles%\HTML Help Workshop;%PATH% -@if exist "%ProgramFiles(x86)%\HTML Help Workshop" set PATH=%ProgramFiles(x86)%\HTML Help Workshop;%PATH% -@if exist "%VCINSTALLDIR%VCPackages" set PATH=%VCINSTALLDIR%VCPackages;%PATH% -@set PATH=%FrameworkDir%%Framework35Version%;%PATH% -@set PATH=%FrameworkDir%%FrameworkVersion%;%PATH% -@set PATH=%VSINSTALLDIR%Common7\Tools;%PATH% -@if exist "%VCINSTALLDIR%BIN" set PATH=%VCINSTALLDIR%BIN;%PATH% -@set PATH=%DevEnvDir%;%PATH% - -@if exist "%VSINSTALLDIR%VSTSDB\Deploy" ( - @set "PATH=%VSINSTALLDIR%VSTSDB\Deploy;%PATH%" -) - -@if not "%FSHARPINSTALLDIR%" == "" ( - @set "PATH=%FSHARPINSTALLDIR%;%PATH%" -) - -@rem INCLUDE -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\INCLUDE" set INCLUDE=%VCINSTALLDIR%ATLMFC\INCLUDE;%INCLUDE% -@if exist "%VCINSTALLDIR%INCLUDE" set INCLUDE=%VCINSTALLDIR%INCLUDE;%INCLUDE% - -@rem LIB -@rem --- -@if exist "%VCINSTALLDIR%ATLMFC\LIB" set LIB=%VCINSTALLDIR%ATLMFC\LIB;%LIB% -@if exist "%VCINSTALLDIR%LIB" set LIB=%VCINSTALLDIR%LIB;%LIB% - -@rem LIBPATH -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\LIB" set LIBPATH=%VCINSTALLDIR%ATLMFC\LIB;%LIBPATH% -@if exist "%VCINSTALLDIR%LIB" set LIBPATH=%VCINSTALLDIR%LIB;%LIBPATH% -@set LIBPATH=%FrameworkDir%%Framework35Version%;%LIBPATH% -@set LIBPATH=%FrameworkDir%%FrameworkVersion%;%LIBPATH% - -@goto end - -@REM ----------------------------------------------------------------------- -:GetVSCommonToolsDir -@set VS100COMNTOOLS= -@call :GetVSCommonToolsDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVSCommonToolsDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -:GetVSCommonToolsDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:error_no_VS100COMNTOOLSDIR -@echo ERROR: Cannot determine the location of the VS Common Tools folder. -@goto end - -:error_no_VSINSTALLDIR -@echo ERROR: Cannot determine the location of the VS installation. -@goto end - -:error_no_FrameworkDIR32 -@echo ERROR: Cannot determine the location of the .NET Framework 32bit installation. -@goto end - -:error_no_FrameworkVer32 -@echo ERROR: Cannot determine the version of the .NET Framework 32bit installation. -@goto end - -:error_no_Framework35Version -@echo ERROR: Cannot determine the .NET Framework 3.5 version. -@goto end - -:end - -msbuild msvc-2010-360.sln /p:Configuration=Release_LTCG /target:clean -msbuild msvc-2010-360.sln /p:Configuration=Release_LTCG -exit diff --git a/libretro-stella/msvc/msvc-2010.bat b/libretro-stella/msvc/msvc-2010.bat deleted file mode 100644 index a4b08228..00000000 --- a/libretro-stella/msvc/msvc-2010.bat +++ /dev/null @@ -1,124 +0,0 @@ -@echo off - -@echo Setting environment for using Microsoft Visual Studio 2010 x86 tools. - -@call :GetVSCommonToolsDir -@if "%VS100COMNTOOLS%"=="" goto error_no_VS100COMNTOOLSDIR - -@call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" 32bit No64bit - -@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR -@if "%FrameworkDir32%"=="" goto error_no_FrameworkDIR32 -@if "%FrameworkVersion32%"=="" goto error_no_FrameworkVer32 -@if "%Framework35Version%"=="" goto error_no_Framework35Version - -@set FrameworkDir=%FrameworkDir32% -@set FrameworkVersion=%FrameworkVersion32% - -@if not "%WindowsSdkDir%" == "" ( - @set "PATH=%WindowsSdkDir%bin\NETFX 4.0 Tools;%WindowsSdkDir%bin;%PATH%" - @set "INCLUDE=%WindowsSdkDir%include;%INCLUDE%" - @set "LIB=%WindowsSdkDir%lib;%LIB%" -) - -@rem -@rem Root of Visual Studio IDE installed files. -@rem -@set DevEnvDir=%VSINSTALLDIR%Common7\IDE\ - -@rem PATH -@rem ---- -@if exist "%VSINSTALLDIR%Team Tools\Performance Tools" ( - @set "PATH=%VSINSTALLDIR%Team Tools\Performance Tools;%PATH%" -) -@if exist "%ProgramFiles%\HTML Help Workshop" set PATH=%ProgramFiles%\HTML Help Workshop;%PATH% -@if exist "%ProgramFiles(x86)%\HTML Help Workshop" set PATH=%ProgramFiles(x86)%\HTML Help Workshop;%PATH% -@if exist "%VCINSTALLDIR%VCPackages" set PATH=%VCINSTALLDIR%VCPackages;%PATH% -@set PATH=%FrameworkDir%%Framework35Version%;%PATH% -@set PATH=%FrameworkDir%%FrameworkVersion%;%PATH% -@set PATH=%VSINSTALLDIR%Common7\Tools;%PATH% -@if exist "%VCINSTALLDIR%BIN" set PATH=%VCINSTALLDIR%BIN;%PATH% -@set PATH=%DevEnvDir%;%PATH% - -@if exist "%VSINSTALLDIR%VSTSDB\Deploy" ( - @set "PATH=%VSINSTALLDIR%VSTSDB\Deploy;%PATH%" -) - -@if not "%FSHARPINSTALLDIR%" == "" ( - @set "PATH=%FSHARPINSTALLDIR%;%PATH%" -) - -@rem INCLUDE -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\INCLUDE" set INCLUDE=%VCINSTALLDIR%ATLMFC\INCLUDE;%INCLUDE% -@if exist "%VCINSTALLDIR%INCLUDE" set INCLUDE=%VCINSTALLDIR%INCLUDE;%INCLUDE% - -@rem LIB -@rem --- -@if exist "%VCINSTALLDIR%ATLMFC\LIB" set LIB=%VCINSTALLDIR%ATLMFC\LIB;%LIB% -@if exist "%VCINSTALLDIR%LIB" set LIB=%VCINSTALLDIR%LIB;%LIB% - -@rem LIBPATH -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\LIB" set LIBPATH=%VCINSTALLDIR%ATLMFC\LIB;%LIBPATH% -@if exist "%VCINSTALLDIR%LIB" set LIBPATH=%VCINSTALLDIR%LIB;%LIBPATH% -@set LIBPATH=%FrameworkDir%%Framework35Version%;%LIBPATH% -@set LIBPATH=%FrameworkDir%%FrameworkVersion%;%LIBPATH% - -@goto end - -@REM ----------------------------------------------------------------------- -:GetVSCommonToolsDir -@set VS100COMNTOOLS= -@call :GetVSCommonToolsDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVSCommonToolsDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -:GetVSCommonToolsDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:error_no_VS100COMNTOOLSDIR -@echo ERROR: Cannot determine the location of the VS Common Tools folder. -@goto end - -:error_no_VSINSTALLDIR -@echo ERROR: Cannot determine the location of the VS installation. -@goto end - -:error_no_FrameworkDIR32 -@echo ERROR: Cannot determine the location of the .NET Framework 32bit installation. -@goto end - -:error_no_FrameworkVer32 -@echo ERROR: Cannot determine the version of the .NET Framework 32bit installation. -@goto end - -:error_no_Framework35Version -@echo ERROR: Cannot determine the .NET Framework 3.5 version. -@goto end - -:end - -msbuild msvc-2010.sln /p:Configuration=Release /target:clean -msbuild msvc-2010.sln /p:Configuration=Release -exit diff --git a/libretro-stella/msvc/msvc-2010.sln b/libretro-stella/msvc/msvc-2010.sln deleted file mode 100644 index a2ace774..00000000 --- a/libretro-stella/msvc/msvc-2010.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc-2010", "msvc-2010\msvc-2010.vcxproj", "{A8A38628-FB5D-473D-8019-29FA83CD1156}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A8A38628-FB5D-473D-8019-29FA83CD1156}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8A38628-FB5D-473D-8019-29FA83CD1156}.Debug|Win32.Build.0 = Debug|Win32 - {A8A38628-FB5D-473D-8019-29FA83CD1156}.Release|Win32.ActiveCfg = Release|Win32 - {A8A38628-FB5D-473D-8019-29FA83CD1156}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libretro-stella/msvc/msvc-2010/msvc-2010.vcxproj b/libretro-stella/msvc/msvc-2010/msvc-2010.vcxproj deleted file mode 100644 index 92e0abf8..00000000 --- a/libretro-stella/msvc/msvc-2010/msvc-2010.vcxproj +++ /dev/null @@ -1,141 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {A8A38628-FB5D-473D-8019-29FA83CD1156} - Win32Proj - msvc2010 - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - true - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;%(PreprocessorDefinitions);__LIBRETRO__;HAVE_INTTYPES - $(SolutionDir)\..\stella;$(SolutionDir)\..\stella\cart;$(SolutionDir)\..\stella\system;$(SolutionDir)\..\stella\utility;$(SolutionDir)\..\stella\properties;$(SolutionDir)\..\stella\input;%(AdditionalIncludeDirectories) - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;%(PreprocessorDefinitions);__LIBRETRO__;HAVE_INTTYPES - $(SolutionDir)\..\stella;$(SolutionDir)\..\stella\cart;$(SolutionDir)\..\stella\system;$(SolutionDir)\..\stella\utility;$(SolutionDir)\..\stella\properties;$(SolutionDir)\..\stella\input;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libretro-stella/msvc/msvc-2010/msvc-2010.vcxproj.filters b/libretro-stella/msvc/msvc-2010/msvc-2010.vcxproj.filters deleted file mode 100644 index 63e98709..00000000 --- a/libretro-stella/msvc/msvc-2010/msvc-2010.vcxproj.filters +++ /dev/null @@ -1,211 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {1083673e-5f58-4f44-a1ef-3fd55ee692d1} - - - {099f27b4-2cf9-4331-b3f5-29ce9353c354} - - - {9038fbba-a7dd-4784-b163-4293e83c025d} - - - {6570af46-a7fb-451d-be8b-6d9532c839e5} - - - {1312770c-a98a-4df9-b173-b0fbbec36c61} - - - {d9d407c4-770a-4d8d-a4fa-f954f41d056b} - - - - - Source Files - - - Source Files\stella - - - Source Files\stella - - - Source Files\stella - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\cart - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\input - - - Source Files\stella\properties - - - Source Files\stella\properties - - - Source Files\stella\system - - - Source Files\stella\system - - - Source Files\stella\system - - - Source Files\stella\system - - - Source Files\stella\system - - - Source Files\stella\system - - - Source Files\stella\system - - - Source Files\stella\utility - - - Source Files\stella\utility - - - Source Files\stella\utility - - - \ No newline at end of file From 3637156a124f8ff6888a62d852f245c72313324f Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 17 Mar 2014 20:03:51 +0100 Subject: [PATCH 5/7] (libretro-build-win.sh) Add Picodrive --- libretro-build-common-xdk.sh | 14 ++++++++++++++ libretro-build-win.sh | 1 + 2 files changed, 15 insertions(+) diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh index 910e4576..00438325 100644 --- a/libretro-build-common-xdk.sh +++ b/libretro-build-common-xdk.sh @@ -220,6 +220,20 @@ build_libretro_stella() fi } +build_libretro_picodrive() +{ + cd $BASE_DIR + if [ -d "libretro-picodrive" ]; then + echo "=== Building Picodrive ===" + cd libretro-picodrive + cd platform/libretro/msvc + cmd.exe /k $MSVC_NAME.bat + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/picodrive_libretro$FORMAT.$FORMAT_EXT + else + echo Picodrive not fetched, skipping ..." + fi +} + build_libretro_nestopia() { cd $BASE_DIR diff --git a/libretro-build-win.sh b/libretro-build-win.sh index e849385a..290cc7a6 100644 --- a/libretro-build-win.sh +++ b/libretro-build-win.sh @@ -39,5 +39,6 @@ else build_libretro_nestopia build_libretro_tyrquake build_libretro_mame078 + build_libretro_picodrive #build_libretro_handy fi From bfc6b00c67d717dea6e2d1b6c2e483a149448da1 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 17 Mar 2014 20:06:21 +0100 Subject: [PATCH 6/7] Update libretro-build-common-xdk.sh --- libretro-build-common-xdk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh index 00438325..6d7cc443 100644 --- a/libretro-build-common-xdk.sh +++ b/libretro-build-common-xdk.sh @@ -230,7 +230,7 @@ build_libretro_picodrive() cmd.exe /k $MSVC_NAME.bat cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/picodrive_libretro$FORMAT.$FORMAT_EXT else - echo Picodrive not fetched, skipping ..." + echo "Picodrive not fetched, skipping ..." fi } From bff1584e1c2db34faf604ae7135954752752f7cf Mon Sep 17 00:00:00 2001 From: AndresSM Date: Tue, 18 Mar 2014 15:07:30 -0500 Subject: [PATCH 7/7] add MAME/MESS rebuild options --- libretro-build-common.sh | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libretro-build-common.sh b/libretro-build-common.sh index 3946d102..3d92ba03 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -340,23 +340,23 @@ build_libretro_mame() { echo '=== Building MAME ===' cd libretro-mame/0152 - "${MAKE}" -f Makefile.libretro platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MAME' - "${MAKE}" -f Makefile.libretro platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MAME' + "${MAKE}" -f Makefile.libretro "TARGET=mame" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MAME' + "${MAKE}" -f Makefile.libretro "TARGET=mame" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MAME' cp "mame_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" else echo 'MAME not fetched, skipping ...' fi } -build_libretro_mame_tiny() { +rebuild_libretro_mame() { cd "${BASE_DIR}" if [ -d 'libretro-mame' ]; then echo '=== Building MAME ===' cd libretro-mame/0152 - "${MAKE}" -f Makefile.libretro "TARGET=mame" "SUBTARGET=tiny" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MESS' - "${MAKE}" -f Makefile.libretro "TARGET=mame" "SUBTARGET=tiny" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MESS' - cp "mame_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}\\mame_tiny_libretro${FORMAT}.${FORMAT_EXT}" + "${MAKE}" -f Makefile.libretro "TARGET=mame" "PARTIAL=1" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MAME' + "${MAKE}" -f Makefile.libretro "TARGET=mame" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MAME' + cp "mame_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" else echo 'MAME not fetched, skipping ...' fi @@ -376,6 +376,20 @@ build_libretro_mess() { fi } +rebuild_libretro_mess() { + cd "${BASE_DIR}" + if [ -d 'libretro-mame' ]; then + echo '=== Building MESS ===' + cd libretro-mame/0152 + + "${MAKE}" -f Makefile.libretro "TARGET=mess" "PARTIAL=1" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MESS' + "${MAKE}" -f Makefile.libretro "TARGET=mess" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MESS' + cp "mess_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" + else + echo 'MAME not fetched, skipping ...' + fi +} + build_libretro_ume() { cd "${BASE_DIR}" if [ -d 'libretro-mame' ]; then @@ -390,20 +404,6 @@ build_libretro_ume() { fi } -build_libretro_mess_tiny() { - cd "${BASE_DIR}" - if [ -d 'libretro-mame' ]; then - echo '=== Building MESS ===' - cd libretro-mame/0152 - - "${MAKE}" -f Makefile.libretro "TARGET=mess" "SUBTARGET=tiny" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MESS' - "${MAKE}" -f Makefile.libretro "TARGET=mess" "SUBTARGET=tiny" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MESS' - cp "mess_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}\\mess_tiny_libretro${FORMAT}.${FORMAT_EXT}" - else - echo 'MAME not fetched, skipping ...' - fi -} - build_libretro_vbam() { cd "${BASE_DIR}" if [ -d 'libretro-vbam' ]; then