Commits

Riley Labrecque committed 3c25112

Added support for MSVC10

Comments (0)

Files changed (7)

projects/msvc10/mupen64plus-video-glide64mk2.vcxproj

+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A4D13408-A794-4199-8FC7-4A9A32505005}</ProjectGuid>
+    <RootNamespace>n64Glide</RootNamespace>
+    <ProjectName>mupen64plus-video-glide64mk2</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">F:\Code\Third Party\boost;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">F:\Code\Third Party\boost\stage\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/n64Glide.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(WXDIR)\lib\vc_lib\msw;$(WXDIR)\include;..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;__MSC__;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/n64Glide.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>3dmathSIMD.obj;Texture.obj;FixedPoint.obj;glide3x.lib;wxmsw28d_core.lib;wxbase28d.lib;wxexpatd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;winmm.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)Glide64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\lib;$(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/Glide64.pdb</ProgramDatabaseFile>
+      <ImportLibrary>.\Debug/Glide64.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/n64Glide.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/n64Glide.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
+      <AdditionalIncludeDirectories>..\..\..\mupen64plus-core\src\api;..\..\src\Glide64;..\..\src\Glide64\inc;..\..\src\GlideHQ;..\..\src\GlideHQ\tc-1.1+;..\..\src\Glitch64;..\..\src\Glitch64\inc;..\..\..\mupen64plus-win32-deps\SDL-1.2.14\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.3\include;..\..\..\mupen64plus-win32-deps\libpng-1.2.37\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;__MSC__;WIN32;__VISUALC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <PrecompiledHeaderOutputFile>.\Release/n64Glide.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>SDL.lib;zlib.lib;libpng.lib;opengl32.lib;winmm.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;msvcrt.lib;LIBCMT.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\mupen64plus-win32-deps\libpng-1.2.37\lib;..\..\..\mupen64plus-win32-deps\zlib-1.2.3\lib;..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>
+      </ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/n64Glide.bsc</OutputFile>
+    </Bscmake>
+    <MASM>
+      <EnableMASM51Compatibility>true</EnableMASM51Compatibility>
+    </MASM>
+    <PostBuildEvent>
+      <Message>Copying shared data and libraries to build directory...</Message>
+      <Command>copy ..\..\data\* "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\Glide64\3dmath.cpp" />
+    <ClCompile Include="..\..\src\Glide64\Combine.cpp" />
+    <ClCompile Include="..\..\src\Glide64\Config.cpp" />
+    <ClCompile Include="..\..\src\Glide64\CRC.cpp" />
+    <ClCompile Include="..\..\src\Glide64\Debugger.cpp" />
+    <ClCompile Include="..\..\src\Glide64\DepthBufferRender.cpp" />
+    <ClCompile Include="..\..\src\Glide64\FBtoScreen.cpp" />
+    <ClCompile Include="..\..\src\Glide64\Ini.cpp" />
+    <ClCompile Include="..\..\src\Glide64\Keys.cpp" />
+    <ClCompile Include="..\..\src\Glide64\Main.cpp" />
+    <ClCompile Include="..\..\src\Glide64\osal_dynamiclib_win32.c" />
+    <ClCompile Include="..\..\src\Glide64\rdp.cpp" />
+    <ClCompile Include="..\..\src\Glide64\TexBuffer.cpp" />
+    <ClCompile Include="..\..\src\Glide64\TexCache.cpp" />
+    <ClCompile Include="..\..\src\Glide64\Util.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\Ext_TxFilter.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\dxtn.c" />
+    <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\fxt1.c" />
+    <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\texstore.c" />
+    <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\wrapper.c" />
+    <ClCompile Include="..\..\src\GlideHQ\TextureFilters.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TextureFilters_2xsai.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TextureFilters_hq2x.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TextureFilters_hq4x.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TxCache.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TxDbg.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TxFilter.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TxFilterExport.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TxHiResCache.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TxImage.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TxQuantize.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TxReSample.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TxTexCache.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\TxUtil.cpp" />
+    <ClCompile Include="..\..\src\Glitch64\combiner.cpp" />
+    <ClCompile Include="..\..\src\Glitch64\geometry.cpp" />
+    <ClCompile Include="..\..\src\Glitch64\main.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release/%(Filename)1.obj</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glitch64\textures.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\Glide64\3dmathSIMD.asm" />
+    <None Include="..\..\src\Glide64\FixedPoint.asm" />
+    <None Include="..\..\src\Glide64\Texture.asm">
+      <FileType>Document</FileType>
+    </None>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>

projects/msvc10/mupen64plus-video-glide64mk2.vcxproj.filters

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Glitch64">
+      <UniqueIdentifier>{44b9ea4e-bb1f-45ef-9b11-c93aace0416c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GlideHQ">
+      <UniqueIdentifier>{daabfc00-53db-4996-9c67-80f7092cb54f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GlideHQ\tc-1.1+">
+      <UniqueIdentifier>{8e81e299-f474-448c-a104-5149bffd92f4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Glide64">
+      <UniqueIdentifier>{d0e07863-9ec2-4409-a91e-bddc436aa16b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Glide64\Windows">
+      <UniqueIdentifier>{c6ba9864-aee3-4434-954b-8c5679c2959c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="asm">
+      <UniqueIdentifier>{b8d8c948-32b5-4ac7-b558-cd807470175c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\Glitch64\geometry.cpp">
+      <Filter>Glitch64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glitch64\textures.cpp">
+      <Filter>Glitch64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glitch64\combiner.cpp">
+      <Filter>Glitch64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TextureFilters_hq4x.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TxCache.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TxDbg.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TxFilter.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TxFilterExport.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TxHiResCache.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TxImage.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TxQuantize.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TxReSample.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TxTexCache.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TxUtil.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\Ext_TxFilter.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TextureFilters.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TextureFilters_2xsai.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\TextureFilters_hq2x.cpp">
+      <Filter>GlideHQ</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\texstore.c">
+      <Filter>GlideHQ\tc-1.1+</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\wrapper.c">
+      <Filter>GlideHQ\tc-1.1+</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\dxtn.c">
+      <Filter>GlideHQ\tc-1.1+</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\fxt1.c">
+      <Filter>GlideHQ\tc-1.1+</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\Util.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\3dmath.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\Combine.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\Config.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\CRC.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\Debugger.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\DepthBufferRender.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\FBtoScreen.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\Ini.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\Keys.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\Main.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\rdp.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\TexBuffer.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\TexCache.cpp">
+      <Filter>Glide64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glide64\osal_dynamiclib_win32.c">
+      <Filter>Glide64\Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Glitch64\main.cpp">
+      <Filter>Glitch64</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\Glide64\3dmathSIMD.asm">
+      <Filter>asm</Filter>
+    </None>
+    <None Include="..\..\src\Glide64\FixedPoint.asm">
+      <Filter>asm</Filter>
+    </None>
+    <None Include="..\..\src\Glide64\Texture.asm">
+      <Filter>asm</Filter>
+    </None>
+  </ItemGroup>
+</Project>

src/Glide64/Main.cpp

 #include "FBtoScreen.h"
 #include "DepthBufferRender.h"
 
+#if defined(__GNUC__)
 #include <sys/time.h>
+#elif defined(__MSC__)
+#include <time.h>
+#define PATH_MAX MAX_PATH
+#endif
 #include "osal_dynamiclib.h"
 #ifdef TEXTURE_FILTER // Hiroshi Morii <koolsmoky@users.sourceforge.net>
 #include <stdarg.h>
   else
     grTextureBufferExt = 0;
 
-#warning not sure what to replace wxDynamicLibrary with
+#pragma message ( "TODO: not sure what to replace wxDynamicLibrary with" )
 /*#ifdef __WINDOWS__
   wxDynamicLibrary glidelib(_T("glide3x"));
   if (glidelib.IsLoaded())

src/Glide64/TexCache.cpp

       if (ghq_dmptex_toggle_key) {
         DisplayLoadProgress(L"Texture dump - ON\n");
         ClearCache();
-        #warning should sleep here
+        #pragma message( "TODO: should sleep here" )
 //        wxThread::Sleep(1000);
       } else {
         DisplayLoadProgress(L"Texture dump - OFF\n");

src/Glide64/rdp.cpp

 #include "FBtoScreen.h"
 #include "CRC.h"
 
+#if defined(OLDASM_asmLoadBlock) || defined(OLDASM_asmLoadTile)
 extern "C" void SwapBlock32 ();
 //extern "C" void SwapBlock64 ();
+#endif
 
 /*
 const int NumOfFormats = 3;
   if (rdp.tiles[tile].size == 3)
     cnt <<= 1;
 
-  wxUIntPtr SwapMethod = wxPtrToUInt(reinterpret_cast<void*>(SwapBlock32));
-
   if (rdp.timg.size == 3)
     LoadBlock32b(tile, ul_s, ul_t, lr_s, dxt);
   else
 #ifdef OLDASM_asmLoadBlock
+    wxUIntPtr SwapMethod = wxPtrToUInt(reinterpret_cast<void*>(SwapBlock32));
     asmLoadBlock((uint32_t *)gfx.RDRAM, (uint32_t *)dst, off, _dxt, cnt, SwapMethod);
 #else
   loadBlock((uint32_t *)gfx.RDRAM, (uint32_t *)dst, off, _dxt, cnt);
       return;
 
     wxUint32 wid_64 = rdp.tiles[tile].line;
-    wxUIntPtr SwapMethod = wxPtrToUInt(reinterpret_cast<void*>(SwapBlock32));
     unsigned char *dst = ((unsigned char *)rdp.tmem) + (rdp.tiles[tile].t_mem<<3);
     unsigned char *end = ((unsigned char *)rdp.tmem) + 4096 - (wid_64<<3);
 #ifdef OLDASM_asmLoadTile
+    wxUIntPtr SwapMethod = wxPtrToUInt(reinterpret_cast<void*>(SwapBlock32));
     asmLoadTile((uint32_t *)gfx.RDRAM, (uint32_t *)dst, wid_64, height, line_n, offs, (uint32_t *)end, SwapMethod);
 #else
     loadTile((uint32_t *)gfx.RDRAM, (uint32_t *)dst, wid_64, height, line_n, offs, (uint32_t *)end);

src/Glide64/winlnxdefs.h

 
 #define _T(x) x
 
-#if !defined(WIN32) || defined(__GNUC__)
-
 #include <stdint.h>
 
-
 typedef int BOOL;
 typedef uint32_t wxUint32;
 typedef uint16_t wxUint16;
 typedef unsigned char wxChar;
 typedef uintptr_t wxUIntPtr;
 
-#else
-
-typedef DWORD wxUint32;
-typedef WORD wxUint16;
-typedef BYTE wxUint8;
-
-typedef int wxInt32;
-typedef short wxInt16;
-typedef char wxInt8;
-
-
-typedef BYTE char wxChar;
-typedef uintptr_t wxUIntPtr;
-
-#endif
-
-
 #ifndef WIN32
 
 typedef union _LARGE_INTEGER

src/GlideHQ/TxUtil.cpp

 {
 #if defined(__GNUC__)
   return __builtin_ctz(num);
+#elif defined(_MSC_VER) && _MSC_VER >= 1400
+  uint32_t i;
+  _BitScanForward((DWORD *)&i, num);
+  return i;
 #elif defined(__MSC__)
   __asm {
     mov eax, dword ptr [num];
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.