Commits

wahrhaft committed a6c5c79

Win32 build fixes

Comments (0)

Files changed (2)

projects/msvc9/mupen64plus-video-glide64.vcproj

 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
+			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../src;../../src/wrapper;../../../mupen64plus-core/src/api"
+				AdditionalIncludeDirectories="../../src;../../src/wrapper;../../../mupen64plus-core/src/api;../../../mupen64plus-win32-deps/SDL-1.2.14/include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib glu32.lib ..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDL.lib "
 				GenerateDebugInformation="true"
+				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
 						ObjectFile="$(IntDir)\wrapper\"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\wrapper\"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\wrapper\2xsai.h"
 						ObjectFile="$(IntDir)\wrapper\"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\wrapper\"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\wrapper\config.cpp"
 						ObjectFile="$(IntDir)\wrapper\"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\wrapper\"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\wrapper\filter.cpp"
 						ObjectFile="$(IntDir)\wrapper\"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\wrapper\"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\wrapper\g3ext.h"
 						ObjectFile="$(IntDir)\wrapper\"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\wrapper\"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\wrapper\glide.h"
 						ObjectFile="$(IntDir)\wrapper\"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\wrapper\"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\wrapper\hq4x.cpp"
 						ObjectFile="$(IntDir)\wrapper\"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\wrapper\"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\wrapper\main.cpp"
 						ObjectFile="$(IntDir)\wrapper\"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\wrapper\"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\wrapper\main.h"
 						ObjectFile="$(IntDir)\wrapper\"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\wrapper\"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>
 size        1 = BYTE, 2 = WORD, 4 = DWORD
 output:   none
 *******************************************************************/
-EXPORT void CALL FBRead(DWORD addr)
+EXPORT void CALL FBRead(unsigned int addr)
 {
     LOG ("FBRead ()\n");
 
 size        1 = BYTE, 2 = WORD, 4 = DWORD
 output:   none
 *******************************************************************/
-EXPORT void CALL FBWrite(DWORD addr, DWORD size)
+EXPORT void CALL FBWrite(unsigned int addr, unsigned int size)
 {
     LOG ("FBWrite ()\n");
   if (cpu_fb_ignore)