diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh index 3967f836..5cdbf920 100755 --- a/libretro-build-android-mk.sh +++ b/libretro-build-android-mk.sh @@ -631,4 +631,5 @@ else build_libretro_mupen64 #build_libretro_ffmpeg build_libretro_dinothawr + build_libretro_3dengine fi diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh index f59590e5..abaf36ee 100644 --- a/libretro-build-common-xdk.sh +++ b/libretro-build-common-xdk.sh @@ -6,33 +6,92 @@ die() #exit 1 } -build_libretro_mednafen() +build_libretro_mednafen_pce_fast() { cd $BASE_DIR if [ -d "libretro-mednafen" ]; then - echo "=== Building Mednafen ===" + echo "=== Building Mednafen PCE Fast ===" cd libretro-mednafen cd msvc/pce-fast cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/mednafen_pce_fast_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" - - cd ../ - cd wswan - cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/mednafen_wswan_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" - - cd ../ - cd ngp - cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/mednafen_ngp_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" - - cd ../ - cd vb - cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/mednafen_vb_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_pce_fast_libretro$FORMAT.$FORMAT_EXT else - echo "Mednafen not fetched, skipping ..." + echo "Mednafen PCE Fast not fetched, skipping ..." + fi +} + +build_libretro_mednafen_wswan() +{ + cd $BASE_DIR + if [ -d "libretro-mednafen" ]; then + echo "=== Building Mednafen Wswan ===" + cd libretro-mednafen + cd msvc/wswan + + cmd.exe /k $MSVC_NAME.bat + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_wswan_libretro$FORMAT.$FORMAT_EXT + else + echo "Mednafen Wswan not fetched, skipping ..." + fi +} + +build_libretro_mednafen_ngp() +{ + cd $BASE_DIR + if [ -d "libretro-mednafen" ]; then + echo "=== Building Mednafen NGP ===" + cd libretro-mednafen + cd msvc/ngp + + cmd.exe /k $MSVC_NAME.bat + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_ngp_libretro$FORMAT.$FORMAT_EXT + else + echo "Mednafen NGP not fetched, skipping ..." + fi +} + +build_libretro_mednafen_vb() +{ + cd $BASE_DIR + if [ -d "libretro-mednafen" ]; then + echo "=== Building Mednafen VB ===" + cd libretro-mednafen + cd msvc/vb + + cmd.exe /k $MSVC_NAME.bat + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_vb_libretro$FORMAT.$FORMAT_EXT + else + echo "Mednafen VB not fetched, skipping ..." + fi +} + +build_libretro_mednafen_gba() +{ + cd $BASE_DIR + if [ -d "libretro-mednafen" ]; then + echo "=== Building Mednafen GBA ===" + cd libretro-mednafen + cd msvc/gba + + cmd.exe /k $MSVC_NAME.bat + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_gba_libretro$FORMAT.$FORMAT_EXT + else + echo "Mednafen GBA not fetched, skipping ..." + fi +} + +build_libretro_s9x() +{ + cd $BASE_DIR + if [ -d "libretro-s9x" ]; then + echo "=== Building SNES9x ===" + cd libretro-s9x/ + cd libretro/msvc + cmd.exe /k $MSVC_NAME.bat + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/snes9x_libretro$FORMAT.$FORMAT_EXT + else + echo "SNES9x not fetched, skipping ..." fi } @@ -44,7 +103,7 @@ build_libretro_s9x_next() cd libretro-s9x-next/ cd libretro/msvc cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/snes9x_next_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/snes9x_next_libretro$FORMAT.$FORMAT_EXT else echo "SNES9x-Next not fetched, skipping ..." fi @@ -58,7 +117,7 @@ build_libretro_genplus() cd libretro-genplus/ cd libretro/msvc cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/genesis_plus_gx_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/genesis_plus_gx_libretro$FORMAT.$FORMAT_EXT else echo "Genplus GX not fetched, skipping ..." fi @@ -72,12 +131,25 @@ build_libretro_vba_next() cd libretro-vba-next/ cd libretro/msvc cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release/vba_next_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" + cp $MSVC_NAME/$RELEASE/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/vba_next_libretro$FORMAT.$FORMAT_EXT else echo "VBA-Next not fetched, skipping ..." fi } +build_libretro_mame078() { + cd "${BASE_DIR}" + if [ -d 'libretro-mame078' ]; then + echo '=== Building MAME 0.78 ===' + cd libretro-mame078 + cd src/libretro/msvc + cmd.exe /k $MSVC_NAME.bat + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mame078_libretro$FORMAT.$FORMAT_EXT + else + echo 'MAME 0.78 not fetched, skipping ...' + fi +} + build_libretro_fceu() { cd $BASE_DIR @@ -86,7 +158,7 @@ build_libretro_fceu() cd libretro-fceu cd fceumm-code/src/drivers/libretro/msvc cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/fceumm_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/fceumm_libretro$FORMAT.$FORMAT_EXT else echo "FCEU not fetched, skipping ..." fi @@ -100,7 +172,7 @@ build_libretro_gambatte() cd libretro-gambatte/libgambatte cd libretro/msvc cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/gambatte_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/gambatte_libretro$FORMAT.$FORMAT_EXT else echo "Gambatte not fetched, skipping ..." fi @@ -114,21 +186,7 @@ build_libretro_nx() cd libretro-nx cd nxengine-1.0.0.4/libretro/msvc cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/nxengine_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" - else - echo "NXEngine not fetched, skipping ..." - fi -} - -build_libretro_nx() -{ - cd "$BASE_DIR" - if [ -d "libretro-nx" ]; then - echo "=== Building NXEngine ===" - cd libretro-nx - cd nxengine-1.0.0.4/libretro/msvc - cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/nxengine_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/nxengine_libretro$FORMAT.$FORMAT_EXT else echo "NXEngine not fetched, skipping ..." fi @@ -142,7 +200,7 @@ build_libretro_prboom() cd libretro-prboom cd libretro/msvc cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/prboom_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/prboom_libretro$FORMAT.$FORMAT_EXT else echo "PRBoom not fetched, skipping ..." fi @@ -156,7 +214,7 @@ build_libretro_nestopia() cd libretro-nestopia/libretro cd msvc cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/nestopia_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/nestopia_libretro$FORMAT.$FORMAT_EXT else echo "Nestopia not fetched, skipping ..." fi @@ -166,27 +224,13 @@ build_libretro_tyrquake() { cd $BASE_DIR if [ -d "libretro-tyrquake" ]; then - echo "=== Building Tyr Quake ===" + echo "=== Building TyrQuake ===" cd libretro-tyrquake cd libretro/msvc cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release/tyrquake_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" + cp $MSVC_NAME/$RELEASE/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/tyrquake_libretro$FORMAT.$FORMAT_EXT else - echo "Tyr Quake not fetched, skipping ..." - fi -} - -build_libretro_nx() -{ - cd $BASE_DIR - if [ -d "libretro-nx" ]; then - echo "=== Building NXEngine ===" - cd libretro-nx - cd nxengine-1.0.0.4/libretro/msvc - cmd.exe /k $MSVC_NAME.bat - cp $MSVC_NAME/Release_LTCG/nxengine_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" - else - echo "NXEngine not fetched, skipping ..." + echo "TyrQuake not fetched, skipping ..." fi } diff --git a/libretro-build-common.sh b/libretro-build-common.sh index 408a8843..d68d6092 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -326,8 +326,8 @@ build_libretro_mame078() { echo '=== Building MAME 0.78 ===' cd libretro-mame078 - "${MAKE}" -f makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean MAME 0.78' - "${MAKE}" -f makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build MAME 0.78' + "${MAKE}" -f makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j1" clean || die 'Failed to clean MAME 0.78' + "${MAKE}" -f makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j1" || die 'Failed to build MAME 0.78' cp "mame078_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" else echo 'MAME 0.78 not fetched, skipping ...' diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh index 4334f858..516c92ca 100755 --- a/libretro-build-ios.sh +++ b/libretro-build-ios.sh @@ -58,4 +58,5 @@ else build_libretro_mupen64 #build_libretro_ffmpeg build_libretro_dinothawr + build_libretro_3dengine fi diff --git a/libretro-build-win.sh b/libretro-build-win.sh index 9461483e..714adab5 100644 --- a/libretro-build-win.sh +++ b/libretro-build-win.sh @@ -6,6 +6,8 @@ RARCH_DIST_DIR=$RARCH_DIR/win FORMAT=_win FORMAT_EXT=dll MSVC_NAME=msvc-2010 +RELEASE_LTCG=Release +RELEASE=Release die() { @@ -18,15 +20,21 @@ source $BASE_DIR/libretro-build-common-xdk.sh if [ $1 ]; then $1 else - #build_libretro_mednafen - #build_libretro_s9x_next - #build_libretro_genplus + build_libretro_mednafen_pce_fast + build_libretro_mednafen_gba + build_libretro_mednafen_ngp + build_libretro_mednafen_vb + build_libretro_mednafen_wswan + build_libretro_s9x + build_libretro_s9x_next + build_libretro_genplus #build_libretro_fba - #build_libretro_vba_next - #build_libretro_fceu - #build_libretro_gambatte - #build_libretro_nx - #build_libretro_prboom - #build_libretro_nestopia + build_libretro_vba_next + build_libretro_fceu + build_libretro_gambatte + build_libretro_nx + build_libretro_prboom + build_libretro_nestopia build_libretro_tyrquake + build_libretro_mame078 fi diff --git a/libretro-build-xdk1.sh b/libretro-build-xdk1.sh index 52939b49..5588c9e9 100644 --- a/libretro-build-xdk1.sh +++ b/libretro-build-xdk1.sh @@ -6,6 +6,8 @@ RARCH_DIST_DIR=$RARCH_DIR/xdk1 FORMAT=_xdk FORMAT_EXT=lib MSVC_NAME=msvc-2003-xbox1 +RELEASE_LTCG=Release_LTCG +RELEASE=Release die() { @@ -13,6 +15,46 @@ die() #exit 1 } +build_libretro_fba_cps1() +{ + cd $BASE_DIR + if [ -d "libretro-fba" ]; then + echo "=== Building Final Burn Alpha Cores (CPS1) ===" + cd libretro-fba/ + cd svn-current/trunk + cd fbacores/cps1/projectfiles/visualstudio-2003-libretro-xbox1 + cmd.exe /k $MSVC_NAME.bat + cp $RELEASE_LTCG/fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_cps1_libretro$FORMAT.${FORMAT_EXT} + fi +} + +build_libretro_fba_cps2() +{ + cd $BASE_DIR + if [ -d "libretro-fba" ]; then + echo "=== Building Final Burn Alpha Cores (CPS2) ===" + cd libretro-fba/ + cd svn-old/trunk + cd fbacores/cps2/projectfiles/visualstudio-2003-libretro-xbox1 + cmd.exe /k $MSVC_NAME.bat + cp $RELEASE_LTCG/libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_cps2_libretro$FORMAT.${FORMAT_EXT} + fi +} + + +build_libretro_fba_neogeo() +{ + cd $BASE_DIR + if [ -d "libretro-fba" ]; then + echo "=== Building Final Burn Alpha Cores (NeoGeo) ===" + cd libretro-fba/ + cd svn-current/trunk + cd fbacores/neogeo/projectfiles/visualstudio-2003-libretro-xbox1 + cmd.exe /k $MSVC_NAME.bat + cp $RELEASE_LTCG/libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_neo_libretro$FORMAT.${FORMAT_EXT} + fi +} + build_libretro_fba() { cd $BASE_DIR @@ -22,24 +64,11 @@ build_libretro_fba() cd svn-current/trunk cd projectfiles/visualstudio-2003-libretro-xbox1 cmd.exe /k $MSVC_NAME.bat - cp Release_LTCG/fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR + cp $RELEASE_LTCG/fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR - echo "=== Building Final Burn Alpha Cores (CPS1) ===" - cd ../../fbacores/cps1/projectfiles/visualstudio-2003-libretro-xbox1 - cmd.exe /k $MSVC_NAME.bat - cp Release_LTCG/fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_cps1_libretro$FORMAT.${FORMAT_EXT} - cd ../../../../ - - echo "=== Building Final Burn Alpha Cores (CPS2) ===" - cd fbacores/cps2/projectfiles/visualstudio-2003-libretro-xbox1 - cmd.exe /k $MSVC_NAME.bat - cp Release_LTCG/libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_cps2_libretro$FORMAT.${FORMAT_EXT} - cd ../../../../ - - echo "=== Building Final Burn Alpha Cores (NeoGeo) ===" - cd fbacores/neogeo/projectfiles/visualstudio-2003-libretro-xbox1 - cmd.exe /k $MSVC_NAME.bat - cp Release_LTCG/libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_neo_libretro$FORMAT.${FORMAT_EXT} + build_libretro_fba_cps1 + build_libretro_fba_cps2 + build_libretro_fba_neogeo else echo "Final Burn Alpha not fetched, skipping ..." fi @@ -50,7 +79,10 @@ source $BASE_DIR/libretro-build-common-xdk.sh if [ $1 ]; then $1 else - build_libretro_mednafen + build_libretro_mednafen_pce_fast + build_libretro_mednafen_ngp + build_libretro_mednafen_wswan + build_libretro_mednafen_vb build_libretro_s9x_next build_libretro_genplus build_libretro_fba diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh index db7086c5..22e94023 100644 --- a/libretro-build-xdk360.sh +++ b/libretro-build-xdk360.sh @@ -6,6 +6,8 @@ RARCH_DIST_DIR=$RARCH_DIR/xdk360 FORMAT=_xdk360 FORMAT_EXT=lib MSVC_NAME=msvc-2010-360 +RELEASE_LTCG=Release_LTCG +RELEASE=Release die() { @@ -22,7 +24,7 @@ build_libretro_fba() cd svn-current/trunk cd projectfiles/visualstudio-2010-libretro-360 cmd.exe /k $MSVC_NAME.bat - cp Release_LTCG/fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR + cp $RELEASE_LTCG/fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR else echo "Final Burn Alpha not fetched, skipping ..." fi @@ -33,7 +35,10 @@ source $BASE_DIR/libretro-build-common-xdk.sh if [ $1 ]; then $1 else - build_libretro_mednafen + build_libretro_mednafen_pce_fast + build_libretro_mednafen_ngp + build_libretro_mednafen_vb + build_libretro_mednafen_wswan build_libretro_s9x_next build_libretro_genplus build_libretro_fba @@ -42,6 +47,9 @@ 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 fi diff --git a/libretro-stella/msvc/msvc-2003-xbox1.bat b/libretro-stella/msvc/msvc-2003-xbox1.bat new file mode 100644 index 00000000..91d69ff5 --- /dev/null +++ b/libretro-stella/msvc/msvc-2003-xbox1.bat @@ -0,0 +1,47 @@ +@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 new file mode 100644 index 00000000..3ca14052 --- /dev/null +++ b/libretro-stella/msvc/msvc-2010-360.bat @@ -0,0 +1,124 @@ +@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 new file mode 100644 index 00000000..a4b08228 --- /dev/null +++ b/libretro-stella/msvc/msvc-2010.bat @@ -0,0 +1,124 @@ +@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 new file mode 100644 index 00000000..a2ace774 --- /dev/null +++ b/libretro-stella/msvc/msvc-2010.sln @@ -0,0 +1,20 @@ + +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 new file mode 100644 index 00000000..92e0abf8 --- /dev/null +++ b/libretro-stella/msvc/msvc-2010/msvc-2010.vcxproj @@ -0,0 +1,141 @@ + + + + + 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 new file mode 100644 index 00000000..63e98709 --- /dev/null +++ b/libretro-stella/msvc/msvc-2010/msvc-2010.vcxproj.filters @@ -0,0 +1,211 @@ + + + + + {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