From 8a0a5b6e41f112c22a67128cc7127ddc869e60df Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 7 Jul 2012 06:19:29 +0300 Subject: [PATCH] (Xbox 1) Xbox 1 solution updates --- console/griffin/hook.h | 2 +- console/rzlib/rzlib.c | 4 +- msvc/RetroArch-Xbox1.sln | 22 +- msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj | 299 +++++++++++--------- 4 files changed, 175 insertions(+), 152 deletions(-) diff --git a/console/griffin/hook.h b/console/griffin/hook.h index 7e410e335b..f8af9f9f10 100644 --- a/console/griffin/hook.h +++ b/console/griffin/hook.h @@ -54,7 +54,7 @@ XBOX 360 ============================================================ */ -#elif defined(_XBOX) +#elif defined(_XBOX360) #define video_init_func(video_info, input, input_data) \ xdk360_init(video_info, input, input_data) diff --git a/console/rzlib/rzlib.c b/console/rzlib/rzlib.c index a82a5f19ec..f3e88eec82 100644 --- a/console/rzlib/rzlib.c +++ b/console/rzlib/rzlib.c @@ -3041,8 +3041,8 @@ extern int unzOpenCurrentFile3 (unzFile file, int *method, int *level, int raw, { pfile_in_zip_read_info->stream.zalloc = (alloc_func)0; pfile_in_zip_read_info->stream.zfree = (free_func)0; - pfile_in_zip_read_info->stream.opaque = (voidpf)0; - pfile_in_zip_read_info->stream.next_in = (voidpf)0; + pfile_in_zip_read_info->stream.opaque = 0; + pfile_in_zip_read_info->stream.next_in = 0; pfile_in_zip_read_info->stream.avail_in = 0; err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS); diff --git a/msvc/RetroArch-Xbox1.sln b/msvc/RetroArch-Xbox1.sln index 311366cab1..6c13d1eb60 100644 --- a/msvc/RetroArch-Xbox1.sln +++ b/msvc/RetroArch-Xbox1.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-Xbox1", "RetroArch-Xbox1/RetroArch-Xbox1.vcproj", "{D45CEB37-21F1-486B-92F0-569B10953978}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-Xbox1", "RetroArch-Xbox1/RetroArch-Xbox1.vcproj", "{0E616FC4-0954-4FE3-935C-B7383B18D325}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject @@ -12,16 +12,16 @@ Global Release_LTCG = Release_LTCG EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution - {D45CEB37-21F1-486B-92F0-569B10953978}.Debug.ActiveCfg = Debug|Win32 - {D45CEB37-21F1-486B-92F0-569B10953978}.Debug.Build.0 = Debug|Win32 - {D45CEB37-21F1-486B-92F0-569B10953978}.Profile.ActiveCfg = Profile|Win32 - {D45CEB37-21F1-486B-92F0-569B10953978}.Profile.Build.0 = Profile|Win32 - {D45CEB37-21F1-486B-92F0-569B10953978}.Profile_FastCap.ActiveCfg = Profile_FastCap|Win32 - {D45CEB37-21F1-486B-92F0-569B10953978}.Profile_FastCap.Build.0 = Profile_FastCap|Win32 - {D45CEB37-21F1-486B-92F0-569B10953978}.Release.ActiveCfg = Release|Win32 - {D45CEB37-21F1-486B-92F0-569B10953978}.Release.Build.0 = Release|Win32 - {D45CEB37-21F1-486B-92F0-569B10953978}.Release_LTCG.ActiveCfg = Release_LTCG|Win32 - {D45CEB37-21F1-486B-92F0-569B10953978}.Release_LTCG.Build.0 = Release_LTCG|Win32 + {0E616FC4-0954-4FE3-935C-B7383B18D325}.Debug.ActiveCfg = Debug|Xbox + {0E616FC4-0954-4FE3-935C-B7383B18D325}.Debug.Build.0 = Debug|Xbox + {0E616FC4-0954-4FE3-935C-B7383B18D325}.Profile.ActiveCfg = Profile|Xbox + {0E616FC4-0954-4FE3-935C-B7383B18D325}.Profile.Build.0 = Profile|Xbox + {0E616FC4-0954-4FE3-935C-B7383B18D325}.Profile_FastCap.ActiveCfg = Profile_FastCap|Xbox + {0E616FC4-0954-4FE3-935C-B7383B18D325}.Profile_FastCap.Build.0 = Profile_FastCap|Xbox + {0E616FC4-0954-4FE3-935C-B7383B18D325}.Release.ActiveCfg = Release|Xbox + {0E616FC4-0954-4FE3-935C-B7383B18D325}.Release.Build.0 = Release|Xbox + {0E616FC4-0954-4FE3-935C-B7383B18D325}.Release_LTCG.ActiveCfg = Release_LTCG|Xbox + {0E616FC4-0954-4FE3-935C-B7383B18D325}.Release_LTCG.Build.0 = Release_LTCG|Xbox EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj index be8aaeb7a1..4368d6ba4b 100644 --- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj +++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj @@ -2,27 +2,29 @@ + Name="Xbox"/> + ConfigurationType="1" + CharacterSet="2"> - + Name="XboxDeploymentTool"/> - - - - + Name="XboxImageTool" + StackSize="65536" + IncludeDebugInfo="TRUE" + NoLibWarn="TRUE"/> + ConfigurationType="1" + CharacterSet="2"> - + Name="XboxDeploymentTool"/> - - - - + Name="XboxImageTool" + StackSize="65536" + IncludeDebugInfo="TRUE" + NoLibWarn="TRUE"/> + ConfigurationType="1" + CharacterSet="2"> + + + + + + + + + + - + AdditionalDependencies="xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xacteng.lib xsndtrk.lib xvoice.lib xonlines.lib xboxkrnl.lib" + OutputFile="$(OutDir)/$(ProjectName).exe" + LinkIncremental="1" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + OptimizeForWindows98="1" + SetChecksum="TRUE" + TargetMachine="1"/> + Name="XboxDeploymentTool"/> - - - - + Name="XboxImageTool" + StackSize="65536"/> + Name="Release_LTCG|Xbox" + OutputDirectory="Release_LTCG" + IntermediateDirectory="Release_LTCG" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="TRUE"> + Optimization="3" + OmitFramePointers="TRUE" + OptimizeForProcessor="2" + AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71"" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\"0.9.6\";__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN" + StringPooling="TRUE" + RuntimeLibrary="0" + BufferSecurityCheck="TRUE" + EnableFunctionLevelLinking="TRUE" + EnableEnhancedInstructionSet="1" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="3"/> - + AdditionalDependencies="xapilib.lib d3d8ltcg.lib d3dx8.lib xgraphicsltcg.lib dsound.lib dmusicltcg.lib xactengltcg.lib xsndtrk.lib xvoice.lib xonlines.lib xboxkrnl.lib" + OutputFile="$(OutDir)/$(ProjectName).exe" + LinkIncremental="1" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + OptimizeForWindows98="1" + SetChecksum="TRUE" + TargetMachine="1"/> + Name="XboxDeploymentTool"/> - - - - - - - - - - - - - - - - - - - + Name="XboxImageTool" + StackSize="65536"/> + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> - - - - - - - - - - - - + Name="Release|Xbox"> @@ -265,8 +277,19 @@ + + + + +