[Scummvm-cvs-logs] CVS: residual main.cpp,1.6,1.7 residual.vcproj,1.1,1.2 resource.cpp,1.5,1.6

Vincent Hamm yazoo at users.sourceforge.net
Mon Aug 25 11:47:07 CEST 2003


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv8711

Modified Files:
	main.cpp residual.vcproj resource.cpp 
Log Message:
Fix compilation of the lua lib (to include math io and str)
Fix compilation and link of resiudal under VC7
The xhash is fixed with an ugly hack at line 38, probably incorrect

Residual under pure win32 version now run up to the splash screen


Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/main.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- main.cpp	24 Aug 2003 17:56:03 -0000	1.6
+++ main.cpp	25 Aug 2003 18:42:24 -0000	1.7
@@ -75,9 +75,9 @@
   lua_open();
 
   lua_beginblock();
-  lua_iolibopen();
-  lua_strlibopen();
-  lua_mathlibopen();
+  //lua_iolibopen();
+  //lua_strlibopen();
+  //lua_mathlibopen();
   lua_endblock();
 
   lua_beginblock();

Index: residual.vcproj
===================================================================
RCS file: /cvsroot/scummvm/residual/residual.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- residual.vcproj	24 Aug 2003 17:56:03 -0000	1.1
+++ residual.vcproj	25 Aug 2003 18:42:24 -0000	1.2
@@ -1,261 +1,263 @@
-<?xml version="1.0" encoding = "windows-1250"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="residual"
-	ProjectGUID="{44D38F29-303D-4E3D-AF45-B96523BF1F9F}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug_Residual"
-			IntermediateDirectory="Debug_Residual"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="lua\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/residual.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/residual.pdb"
-				SubSystem="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release_Residual"
-			IntermediateDirectory="Release_Residual"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="lua\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/residual.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
-			<File
-				RelativePath="actor.cpp">
-			</File>
-			<File
-				RelativePath="actor.h">
-			</File>
-			<File
-				RelativePath="bitmap.cpp">
-			</File>
-			<File
-				RelativePath="bitmap.h">
-			</File>
-			<File
-				RelativePath="bits.h">
-			</File>
-			<File
-				RelativePath="color.h">
-			</File>
-			<File
-				RelativePath="colormap.h">
-			</File>
-			<File
-				RelativePath="costume.cpp">
-			</File>
-			<File
-				RelativePath="costume.h">
-			</File>
-			<File
-				RelativePath="debug.cpp">
-			</File>
-			<File
-				RelativePath="debug.h">
-			</File>
-			<File
-				RelativePath="engine.cpp">
-			</File>
-			<File
-				RelativePath="engine.h">
-			</File>
-			<File
-				RelativePath="hash_map.h">
-			</File>
-			<File
-				RelativePath="keyframe.cpp">
-			</File>
-			<File
-				RelativePath="keyframe.h">
-			</File>
-			<File
-				RelativePath="lab.cpp">
-			</File>
-			<File
-				RelativePath="lab.h">
-			</File>
-			<File
-				RelativePath="localize.cpp">
-			</File>
-			<File
-				RelativePath="localize.h">
-			</File>
-			<File
-				RelativePath="lua.cpp">
-			</File>
-			<File
-				RelativePath="lua.h">
-			</File>
-			<File
-				RelativePath="main.cpp">
-			</File>
-			<File
-				RelativePath="material.cpp">
-			</File>
-			<File
-				RelativePath="material.h">
-			</File>
-			<File
-				RelativePath="mixer.cpp">
-			</File>
-			<File
-				RelativePath="mixer.h">
-			</File>
-			<File
-				RelativePath="model.cpp">
-			</File>
-			<File
-				RelativePath="model.h">
-			</File>
-			<File
-				RelativePath="registry.cpp">
-			</File>
-			<File
-				RelativePath="registry.h">
-			</File>
-			<File
-				RelativePath="resource.cpp">
-			</File>
-			<File
-				RelativePath="resource.h">
-			</File>
-			<File
-				RelativePath="scene.cpp">
-			</File>
-			<File
-				RelativePath="scene.h">
-			</File>
-			<File
-				RelativePath="sound.cpp">
-			</File>
-			<File
-				RelativePath="sound.h">
-			</File>
-			<File
-				RelativePath="stdafx.h">
-			</File>
-			<File
-				RelativePath="textobject.cpp">
-			</File>
-			<File
-				RelativePath="textobject.h">
-			</File>
-			<File
-				RelativePath="textsplit.cpp">
-			</File>
-			<File
-				RelativePath="textsplit.h">
-			</File>
-			<File
-				RelativePath="vector3d.h">
-			</File>
-			<File
-				RelativePath="walkplane.cpp">
-			</File>
-			<File
-				RelativePath="walkplane.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-			<File
-				RelativePath="README">
-			</File>
-			<File
-				RelativePath="TODO">
-			</File>
-			<File
-				RelativePath="residual.rc">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="residual"
+	ProjectGUID="{44D38F29-303D-4E3D-AF45-B96523BF1F9F}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug_Residual"
+			IntermediateDirectory="Debug_Residual"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="lua\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="OpenGL32.Lib GlAux.Lib GLU32.Lib SDL.Lib SDLMain.Lib
+/NODEFAULTLIB:LIBCMTD"
+				OutputFile="$(OutDir)/residual.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/residual.pdb"
+				SubSystem="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release_Residual"
+			IntermediateDirectory="Release_Residual"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="lua\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				StringPooling="TRUE"
+				RuntimeLibrary="4"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/residual.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+			<File
+				RelativePath="actor.cpp">
+			</File>
+			<File
+				RelativePath="actor.h">
+			</File>
+			<File
+				RelativePath="bitmap.cpp">
+			</File>
+			<File
+				RelativePath="bitmap.h">
+			</File>
+			<File
+				RelativePath="bits.h">
+			</File>
+			<File
+				RelativePath="color.h">
+			</File>
+			<File
+				RelativePath="colormap.h">
+			</File>
+			<File
+				RelativePath="costume.cpp">
+			</File>
+			<File
+				RelativePath="costume.h">
+			</File>
+			<File
+				RelativePath="debug.cpp">
+			</File>
+			<File
+				RelativePath="debug.h">
+			</File>
+			<File
+				RelativePath="engine.cpp">
+			</File>
+			<File
+				RelativePath="engine.h">
+			</File>
+			<File
+				RelativePath="hash_map.h">
+			</File>
+			<File
+				RelativePath="keyframe.cpp">
+			</File>
+			<File
+				RelativePath="keyframe.h">
+			</File>
+			<File
+				RelativePath="lab.cpp">
+			</File>
+			<File
+				RelativePath="lab.h">
+			</File>
+			<File
+				RelativePath="localize.cpp">
+			</File>
+			<File
+				RelativePath="localize.h">
+			</File>
+			<File
+				RelativePath="lua.cpp">
+			</File>
+			<File
+				RelativePath="lua.h">
+			</File>
+			<File
+				RelativePath="main.cpp">
+			</File>
+			<File
+				RelativePath="material.cpp">
+			</File>
+			<File
+				RelativePath="material.h">
+			</File>
+			<File
+				RelativePath="mixer.cpp">
+			</File>
+			<File
+				RelativePath="mixer.h">
+			</File>
+			<File
+				RelativePath="model.cpp">
+			</File>
+			<File
+				RelativePath="model.h">
+			</File>
+			<File
+				RelativePath="registry.cpp">
+			</File>
+			<File
+				RelativePath="registry.h">
+			</File>
+			<File
+				RelativePath="resource.cpp">
+			</File>
+			<File
+				RelativePath="resource.h">
+			</File>
+			<File
+				RelativePath="scene.cpp">
+			</File>
+			<File
+				RelativePath="scene.h">
+			</File>
+			<File
+				RelativePath="sound.cpp">
+			</File>
+			<File
+				RelativePath="sound.h">
+			</File>
+			<File
+				RelativePath="stdafx.h">
+			</File>
+			<File
+				RelativePath="textobject.cpp">
+			</File>
+			<File
+				RelativePath="textobject.h">
+			</File>
+			<File
+				RelativePath="textsplit.cpp">
+			</File>
+			<File
+				RelativePath="textsplit.h">
+			</File>
+			<File
+				RelativePath="vector3d.h">
+			</File>
+			<File
+				RelativePath="walkplane.cpp">
+			</File>
+			<File
+				RelativePath="walkplane.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			<File
+				RelativePath="README">
+			</File>
+			<File
+				RelativePath="TODO">
+			</File>
+			<File
+				RelativePath="residual.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/resource.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resource.cpp	24 Aug 2003 17:56:03 -0000	1.5
+++ resource.cpp	25 Aug 2003 18:42:24 -0000	1.6
@@ -45,6 +45,7 @@
 
 #ifdef _MSC_VER
 	WIN32_FIND_DATAA find_file_data;
+	dir_str += '*';
 	HANDLE d = FindFirstFile(dir_str.c_str(), &find_file_data);
 #else
 	DIR *d = opendir(dir_str.c_str());





More information about the Scummvm-git-logs mailing list