diff --git a/Makefile b/Makefile index a0714dc..c32d1a2 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,12 @@ ifneq ($(GIT_VERSION)," unknown") CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" endif -LIBS := -lm +LIBS := + +ifeq (,$(findstring msvc,$(platform))) +LIBS += -lm +endif + LDFLAGS := ifeq ($(STATIC_LINKING),1) @@ -244,6 +249,40 @@ else ifeq ($(platform), gcw0) fpic := -fPIC SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,-no-undefined CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float + +# Windows MSVC 2003 Xbox 1 +else ifeq ($(platform), xbox1_msvc2003) +TARGET := $(TARGET_NAME)_libretro_xdk1.lib +MSVCBINDIRPREFIX = $(XDK)/xbox/bin/vc71 +CC = "$(MSVCBINDIRPREFIX)/CL.exe" +CXX = "$(MSVCBINDIRPREFIX)/CL.exe" +LD = "$(MSVCBINDIRPREFIX)/lib.exe" + +export INCLUDE := $(INCLUDE);$(XDK)/xbox/include +export LIB := $(XDK)/xbox/lib +PSS_STYLE :=2 +CFLAGS += -D_XBOX -D_XBOX1 +CXXFLAGS += -D_XBOX -D_XBOX1 +STATIC_LINKING=1 +HAS_GCC := 0 +# Windows MSVC 2010 Xbox 360 +else ifeq ($(platform), xbox360_msvc2010) +TARGET := $(TARGET_NAME)_libretro_xdk360.lib +MSVCBINDIRPREFIX = $(XEDK)/bin/win32 +CC = cl.exe +CXX = cl.exe +LD = lib.exe + +PATH := $(shell IFS=$$'\n'; cygpath "$(MSVCBINDIRPREFIX)"):$(PATH) + +export INCLUDE := $(XEDK)/include/win32;$(XEDK)/include/xbox +export LIB := $(XEDK)/lib/xbox +PSS_STYLE :=2 +CFLAGS += -D_XBOX -D_XBOX360 +CXXFLAGS += -D_XBOX -D_XBOX360 +STATIC_LINKING=1 +HAS_GCC := 0 + # Windows MSVC 2010 x64 else ifeq ($(platform), windows_msvc2010_x64) CC = cl.exe @@ -335,9 +374,37 @@ CFLAGS += -DHAVE_LIBFLUIDSYNTH endif ifeq ($(DEBUG), 1) -CFLAGS += -O0 -g +ifneq (,$(findstring msvc,$(platform))) + ifeq ($(STATIC_LINKING),1) + CFLAGS += -MTd + CXXFLAGS += -MTd else + CFLAGS += -MDd + CXXFLAGS += -MDd +endif + +CFLAGS += -Od -Zi -DDEBUG -D_DEBUG +CXXFLAGS += -Od -Zi -DDEBUG -D_DEBUG + else + CFLAGS += -O0 -g -DDEBUG + CXXFLAGS += -O0 -g -DDEBUG +endif +else +ifneq (,$(findstring msvc,$(platform))) +ifeq ($(STATIC_LINKING),1) + CFLAGS += -MT + CXXFLAGS += -MT +else + CFLAGS += -MD + CXXFLAGS += -MD +endif + CFLAGS += -O2 -DNDEBUG +CXXFLAGS += -O2 -DNDEBUG +else + CFLAGS += -O2 -DNDEBUG + CXXFLAGS += -O2 -DNDEBUG +endif endif ROOT_DIR := . @@ -370,7 +437,12 @@ LINKOUT = -o ifneq (,$(findstring msvc,$(platform))) OBJOUT = -Fo LINKOUT = -out: +ifeq ($(STATIC_LINKING),1) + LD ?= lib.exe + STATIC_LINKING=0 +else LD = link.exe +endif else LD = $(CC) endif diff --git a/Makefile.common b/Makefile.common index d99c718..23b3c42 100644 --- a/Makefile.common +++ b/Makefile.common @@ -4,6 +4,10 @@ LIBRETRO_COMM_DIR = $(ROOT_DIR)/libretro/libretro-common INCFLAGS = -I$(ROOT_DIR) -I$(CORE_DIR) -I$(DEPS_DIR)/libmad -I$(LIBRETRO_COMM_DIR)/include +ifneq (,$(findstring msvc2003,$(platform))) +INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc +endif + COREDEFINES = -D__LIBRETRO__ -DFPM_DEFAULT ifneq (,$(findstring msvc,$(platform))) diff --git a/libretro/msvc/msvc-2003-xbox1.bat b/libretro/msvc/msvc-2003-xbox1.bat deleted file mode 100644 index 91d69ff..0000000 --- a/libretro/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/msvc/msvc-2003-xbox1.sln b/libretro/msvc/msvc-2003-xbox1.sln deleted file mode 100644 index 44fc99f..0000000 --- a/libretro/msvc/msvc-2003-xbox1.sln +++ /dev/null @@ -1,30 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc-2003-xbox1", "msvc-2003-xbox1/msvc-2003-xbox1.vcproj", "{6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Profile = Profile - Profile_FastCap = Profile_FastCap - Release = Release - Release_LTCG = Release_LTCG - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}.Debug.ActiveCfg = Debug|Xbox - {6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}.Debug.Build.0 = Debug|Xbox - {6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}.Profile.ActiveCfg = Profile|Xbox - {6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}.Profile.Build.0 = Profile|Xbox - {6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}.Profile_FastCap.ActiveCfg = Profile_FastCap|Xbox - {6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}.Profile_FastCap.Build.0 = Profile_FastCap|Xbox - {6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}.Release.ActiveCfg = Release|Xbox - {6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}.Release.Build.0 = Release|Xbox - {6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}.Release_LTCG.ActiveCfg = Release_LTCG|Xbox - {6E356F1B-ABE3-4913-87EF-C3AFCAB7FEBA}.Release_LTCG.Build.0 = Release_LTCG|Xbox - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj b/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj deleted file mode 100644 index 1130085..0000000 --- a/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj +++ /dev/null @@ -1,521 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libretro/msvc/msvc-2003-xbox1/stdint.h b/libretro/msvc/msvc-2003-xbox1/stdint.h deleted file mode 100644 index 9d8fe7b..0000000 --- a/libretro/msvc/msvc-2003-xbox1/stdint.h +++ /dev/null @@ -1,249 +0,0 @@ -// ISO C9x compliant stdint.h for Microsoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006-2008 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. The name of the author may be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////////// -#ifndef __RARCH_STDINT_H -#define __RARCH_STDINT_H - -#if _MSC_VER && (_MSC_VER < 1600) -//pre-MSVC 2010 needs an implementation of stdint.h - -#if _MSC_VER > 1000 -#pragma once -#endif - -#include - -// For Visual Studio 6 in C++ mode and for many Visual Studio versions when -// compiling for ARM we should wrap include with 'extern "C++" {}' -// or compiler give many errors like this: -// error C2733: second C linkage of overloaded function 'wmemchr' not allowed -#ifdef __cplusplus -extern "C" { -#endif -# include -#ifdef __cplusplus -} -#endif - -// Define _W64 macros to mark types changing their size, like intptr_t. -#ifndef _W64 -# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300 -# define _W64 __w64 -# else -# define _W64 -# endif -#endif - - -// 7.18.1 Integer types - -// 7.18.1.1 Exact-width integer types - -// Visual Studio 6 and Embedded Visual C++ 4 doesn't -// realize that, e.g. char has the same size as __int8 -// so we give up on __intX for them. -#if (_MSC_VER < 1300) - typedef signed char int8_t; - typedef signed short int16_t; - typedef signed int int32_t; - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef unsigned int uint32_t; -#else - typedef signed __int8 int8_t; - typedef signed __int16 int16_t; - typedef signed __int32 int32_t; - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; -#endif -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; - - -// 7.18.1.2 Minimum-width integer types -typedef int8_t int_least8_t; -typedef int16_t int_least16_t; -typedef int32_t int_least32_t; -typedef int64_t int_least64_t; -typedef uint8_t uint_least8_t; -typedef uint16_t uint_least16_t; -typedef uint32_t uint_least32_t; -typedef uint64_t uint_least64_t; - -// 7.18.1.3 Fastest minimum-width integer types -typedef int8_t int_fast8_t; -typedef int16_t int_fast16_t; -typedef int32_t int_fast32_t; -typedef int64_t int_fast64_t; -typedef uint8_t uint_fast8_t; -typedef uint16_t uint_fast16_t; -typedef uint32_t uint_fast32_t; -typedef uint64_t uint_fast64_t; - -// 7.18.1.4 Integer types capable of holding object pointers -#ifdef _WIN64 // [ - typedef signed __int64 intptr_t; - typedef unsigned __int64 uintptr_t; -#else // _WIN64 ][ - typedef _W64 signed int intptr_t; - typedef _W64 unsigned int uintptr_t; -#endif // _WIN64 ] - -// 7.18.1.5 Greatest-width integer types -typedef int64_t intmax_t; -typedef uint64_t uintmax_t; - - -// 7.18.2 Limits of specified-width integer types - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 - -// 7.18.2.1 Limits of exact-width integer types -#define INT8_MIN ((int8_t)_I8_MIN) -#define INT8_MAX _I8_MAX -#define INT16_MIN ((int16_t)_I16_MIN) -#define INT16_MAX _I16_MAX -#define INT32_MIN ((int32_t)_I32_MIN) -#define INT32_MAX _I32_MAX -#define INT64_MIN ((int64_t)_I64_MIN) -#define INT64_MAX _I64_MAX -#define UINT8_MAX _UI8_MAX -#define UINT16_MAX _UI16_MAX -#define UINT32_MAX _UI32_MAX -#define UINT64_MAX _UI64_MAX - -// 7.18.2.2 Limits of minimum-width integer types -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MIN INT64_MIN -#define INT_LEAST64_MAX INT64_MAX -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -// 7.18.2.3 Limits of fastest minimum-width integer types -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST16_MAX INT16_MAX -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST32_MAX INT32_MAX -#define INT_FAST64_MIN INT64_MIN -#define INT_FAST64_MAX INT64_MAX -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX UINT16_MAX -#define UINT_FAST32_MAX UINT32_MAX -#define UINT_FAST64_MAX UINT64_MAX - -// 7.18.2.4 Limits of integer types capable of holding object pointers -#ifdef _WIN64 // [ -# define INTPTR_MIN INT64_MIN -# define INTPTR_MAX INT64_MAX -# define UINTPTR_MAX UINT64_MAX -#else // _WIN64 ][ -# define INTPTR_MIN INT32_MIN -# define INTPTR_MAX INT32_MAX -# define UINTPTR_MAX UINT32_MAX -#endif // _WIN64 ] - -// 7.18.2.5 Limits of greatest-width integer types -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -// 7.18.3 Limits of other integer types - -#ifdef _WIN64 // [ -# define PTRDIFF_MIN _I64_MIN -# define PTRDIFF_MAX _I64_MAX -#else // _WIN64 ][ -# define PTRDIFF_MIN _I32_MIN -# define PTRDIFF_MAX _I32_MAX -#endif // _WIN64 ] - -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -#ifndef SIZE_MAX // [ -# ifdef _WIN64 // [ -# define SIZE_MAX _UI64_MAX -# else // _WIN64 ][ -# define SIZE_MAX _UI32_MAX -# endif // _WIN64 ] -#endif // SIZE_MAX ] - -// WCHAR_MIN and WCHAR_MAX are also defined in -#ifndef WCHAR_MIN // [ -# define WCHAR_MIN 0 -#endif // WCHAR_MIN ] -#ifndef WCHAR_MAX // [ -# define WCHAR_MAX _UI16_MAX -#endif // WCHAR_MAX ] - -#define WINT_MIN 0 -#define WINT_MAX _UI16_MAX - -#endif // __STDC_LIMIT_MACROS ] - - -// 7.18.4 Limits of other integer types - -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 - -// 7.18.4.1 Macros for minimum-width integer constants - -#define INT8_C(val) val##i8 -#define INT16_C(val) val##i16 -#define INT32_C(val) val##i32 -#define INT64_C(val) val##i64 - -#define UINT8_C(val) val##ui8 -#define UINT16_C(val) val##ui16 -#define UINT32_C(val) val##ui32 -#define UINT64_C(val) val##ui64 - -// 7.18.4.2 Macros for greatest-width integer constants -#define INTMAX_C INT64_C -#define UINTMAX_C UINT64_C - -#endif // __STDC_CONSTANT_MACROS ] - -#else -//sanity for everything else -#include -#endif - -#endif diff --git a/libretro/msvc/msvc-2010-360.bat b/libretro/msvc/msvc-2010-360.bat deleted file mode 100644 index 3ca1405..0000000 --- a/libretro/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/msvc/msvc-2010-360.sln b/libretro/msvc/msvc-2010-360.sln deleted file mode 100644 index 0ba7165..0000000 --- a/libretro/msvc/msvc-2010-360.sln +++ /dev/null @@ -1,32 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libretro-prboom 360", "msvc-2010-360/msvc-2010-360.vcxproj", "{6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - CodeAnalysis|Xbox 360 = CodeAnalysis|Xbox 360 - Debug|Xbox 360 = Debug|Xbox 360 - Profile_FastCap|Xbox 360 = Profile_FastCap|Xbox 360 - Profile|Xbox 360 = Profile|Xbox 360 - Release_LTCG|Xbox 360 = Release_LTCG|Xbox 360 - Release|Xbox 360 = Release|Xbox 360 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.CodeAnalysis|Xbox 360.ActiveCfg = CodeAnalysis|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.CodeAnalysis|Xbox 360.Build.0 = CodeAnalysis|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.Profile_FastCap|Xbox 360.ActiveCfg = Profile_FastCap|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.Profile_FastCap|Xbox 360.Build.0 = Profile_FastCap|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.Profile|Xbox 360.ActiveCfg = Profile|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.Profile|Xbox 360.Build.0 = Profile|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.Release_LTCG|Xbox 360.ActiveCfg = Release_LTCG|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.Release_LTCG|Xbox 360.Build.0 = Release_LTCG|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7}.Release|Xbox 360.Build.0 = Release|Xbox 360 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj deleted file mode 100644 index 3b2f429..0000000 --- a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj +++ /dev/null @@ -1,894 +0,0 @@ - - - - - CodeAnalysis - Xbox 360 - - - Debug - Xbox 360 - - - Profile - Xbox 360 - - - Profile_FastCap - Xbox 360 - - - Release - Xbox 360 - - - Release_LTCG - Xbox 360 - - - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - true - true - true - true - true - true - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - true - true - true - true - true - true - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - - - - {6BD65FBD-B7EE-49A7-B4A2-CF4D8629FFF7} - Xbox360Proj - - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - $(OutDir)msvc-2010-360$(TargetExt) - - - $(OutDir)msvc-2010-360$(TargetExt) - - - $(OutDir)msvc-2010-360$(TargetExt) - - - $(OutDir)msvc-2010-360$(TargetExt) - - - $(OutDir)msvc-2010-360$(TargetExt) - - - $(OutDir)msvc-2010-360$(TargetExt) - - - - NotUsing - Level3 - ProgramDatabase - Disabled - false - true - false - $(OutDir)$(ProjectName).pch - MultiThreadedDebug - _DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT - Callcap - src;src/libretro;libmad;%(AdditionalIncludeDirectories) - - - true - - - - - NotUsing - Level4 - ProgramDatabase - Disabled - false - true - AnalyzeOnly - false - $(OutDir)$(ProjectName).pch - MultiThreadedDebug - _DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT - Callcap - src;src/libretro;libmad;%(AdditionalIncludeDirectories) - - - true - - - - - Level3 - NotUsing - Full - true - false - true - ProgramDatabase - Size - false - $(OutDir)$(ProjectName).pch - MultiThreaded - NDEBUG;_XBOX;_XBOX360;PROFILE;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT - Callcap - src;src/libretro;libmad;%(AdditionalIncludeDirectories) - - - true - false - xapilib.lib;%(IgnoreSpecificDefaultLibraries) - true - - - - - Level3 - NotUsing - Full - true - false - true - ProgramDatabase - Fastcap - Size - false - $(OutDir)$(ProjectName).pch - MultiThreaded - NDEBUG;_XBOX;_XBOX360;PROFILE;FASTCAP;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT - src;src/libretro;libmad;%(AdditionalIncludeDirectories) - - - true - false - true - - - - - Level3 - NotUsing - Full - true - true - ProgramDatabase - Size - false - false - $(OutDir)$(ProjectName).pch - MultiThreaded - NDEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_STDINT_H;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT - src;src/libretro;libmad;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - Level3 - NotUsing - Full - true - true - ProgramDatabase - Size - false - false - $(OutDir)$(ProjectName).pch - MultiThreaded - NDEBUG;_XBOX;_XBOX360;LTCG;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT - src;src/libretro;libmad;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - - diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters deleted file mode 100644 index a89c187..0000000 --- a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters +++ /dev/null @@ -1,267 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {7383a755-0cd2-47d4-b2ab-0f7a0da6e2c0} - - - {0949392d-3244-4305-bd46-e871ff2bb75a} - - - {3569f772-1953-43ec-b700-93f4f370eb2e} - - - - - Source Files\libretro - - - Source Files\libmad - - - Source Files\libmad - - - Source Files\libmad - - - Source Files\libmad - - - Source Files\libmad - - - Source Files\libmad - - - Source Files\libmad - - - Source Files\libmad - - - Source Files\libmad - - - Source Files\libmad - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - Source Files\src - - - \ No newline at end of file