Skip to content

Commit

Permalink
Created a VS8 project for the debug renderer (temporary). Minor chang…
Browse files Browse the repository at this point in the history 
…es to the debug renderer to fix compilation issues with my recent additions. Now compiles OK.
  • Loading branch information
danij committed Jul 2, 2007
1 parent 861c5df commit 1638e69
Show file tree
Hide file tree
Showing 5 changed files with 363 additions and 7 deletions.
8 changes: 8 additions & 0 deletions doomsday/build/win32/vs8/doomsday.sln
View file
Expand Up @@ -26,6 +26,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WolfTC", "WolfTC.vcproj", "
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsA3D", "dsA3D.vcproj", "{872D3583-05F8-407F-BFAC-111C839845C7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drDebug", "drdebug.vcproj", "{FAD44EAA-44F7-42C1-BCD8-93059C60BDE0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -111,6 +113,12 @@ Global
{872D3583-05F8-407F-BFAC-111C839845C7}.Mesa Release|Win32.Build.0 = Release|Win32
{872D3583-05F8-407F-BFAC-111C839845C7}.Release|Win32.ActiveCfg = Release|Win32
{872D3583-05F8-407F-BFAC-111C839845C7}.Release|Win32.Build.0 = Release|Win32
{FAD44EAA-44F7-42C1-BCD8-93059C60BDE0}.Debug|Win32.ActiveCfg = Debug|Win32
{FAD44EAA-44F7-42C1-BCD8-93059C60BDE0}.Debug|Win32.Build.0 = Debug|Win32
{FAD44EAA-44F7-42C1-BCD8-93059C60BDE0}.Mesa Release|Win32.ActiveCfg = Mesa Release|Win32
{FAD44EAA-44F7-42C1-BCD8-93059C60BDE0}.Mesa Release|Win32.Build.0 = Mesa Release|Win32
{FAD44EAA-44F7-42C1-BCD8-93059C60BDE0}.Release|Win32.ActiveCfg = Release|Win32
{FAD44EAA-44F7-42C1-BCD8-93059C60BDE0}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
336 changes: 336 additions & 0 deletions doomsday/build/win32/vs8/drdebug.vcproj
View file
@@ -0,0 +1,336 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="drDebug"
ProjectGUID="{FAD44EAA-44F7-42C1-BCD8-93059C60BDE0}"
RootNamespace="drDebug"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\./Bin/Debug"
IntermediateDirectory=".\./Obj/Debug/drDebug"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\./Bin/Debug/drDebug.tlb"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\engine\api;..\..\..\plugins\debugrenderer\portable\include"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;drDebugGL_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\./Obj/Debug/drDebug/drDebug.pch"
AssemblerListingLocation=".\./Obj/Debug/drDebug/"
ObjectFile=".\./Obj/Debug/drDebug/"
ProgramDataBaseFileName=".\./Obj/Debug/drDebug/"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1035"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="./bin/debug/doomsday.lib kernel32.lib user32.lib gdi32.lib"
OutputFile=".\./Bin/Debug/drDebug.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\plugins\debugrenderer\api\drDebug.def"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./Bin/Debug/drDebug.pdb"
ImportLibrary=".\./Bin/Debug/drDebug.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Mesa Release|Win32"
OutputDirectory=".\./Bin/Release"
IntermediateDirectory=".\./Obj/Release/drMesa"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\./Bin/Release/drDebug.tlb"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="./Include/drDebug,./Include"
PreprocessorDefinitions="DRMESA;WIN32;NDEBUG;_WINDOWS;_USRDLL;drDebug_EXPORTS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\./Obj/Release/drMesa/drDebug.pch"
AssemblerListingLocation=".\./Obj/Release/drMesa/"
ObjectFile=".\./Obj/Release/drMesa/"
ProgramDataBaseFileName=".\./Obj/Release/drMesa/"
WarningLevel="3"
SuppressStartupBanner="true"
CallingConvention="2"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1035"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="./bin/release/doomsday.lib MesaGL.lib MesaGLU.lib odbc32.lib odbccp32.lib"
OutputFile="./Bin/Release/drMesa.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\Src\drDebug\drMesa.def"
ProgramDatabaseFile=".\./Bin/Release/drMesa.pdb"
ImportLibrary=".\./Bin/Release/drMesa.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\./Bin/Release"
IntermediateDirectory=".\./Obj/Release/drDebug"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\./Bin/Release/drDebug.tlb"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\engine\api;..\..\..\plugins\opengl\portable\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;drDebug_EXPORTS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\./Obj/Release/drDebug/drDebug.pch"
AssemblerListingLocation=".\./Obj/Release/drDebug/"
ObjectFile=".\./Obj/Release/drDebug/"
ProgramDataBaseFileName=".\./Obj/Release/drDebug/"
WarningLevel="3"
SuppressStartupBanner="true"
CallingConvention="2"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1035"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="./bin/release/doomsday.lib kernel32.lib user32.lib gdi32.lib"
OutputFile=".\./Bin/Release/drDebug.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\plugins\opengl\api\drDebug.def"
ProgramDatabaseFile=".\./Bin/Release/drDebug.pdb"
ImportLibrary=".\./Bin/Release/drDebug.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\..\plugins\debugrenderer\src\main.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
</Filter>
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
</Filter>
<Filter
Name="Linker Files"
>
<File
RelativePath="..\..\..\plugins\debugrenderer\api\drdebug.def"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
2 changes: 1 addition & 1 deletion doomsday/engine/portable/include/dd_dgl.h
View file
Expand Up @@ -122,7 +122,7 @@ typedef struct dgldriver_s {
void (*Fogv) (int pname, void *data);
int (*Project) (int num, gl_fc3vertex_t * inVertices,
gl_fc3vertex_t * outVertices);
int (*ReadPixels) (int *inData, int format, void *pixels);
// int (*ReadPixels) (int *inData, int format, void *pixels);
} dgldriver_t;

extern dgldriver_t __gl;
Expand Down
6 changes: 3 additions & 3 deletions doomsday/engine/portable/src/dd_dgl.c
View file
Expand Up @@ -161,7 +161,7 @@ DEF_1(int, Bind, DGLuint)
DEF_2(int, GetIntegerv, int, int*)
DEF_2(int, SetInteger, int, int)
DEF_2(int, SetFloatv, int, float*)
DEF_3(int, ReadPixels, int*, int, void*)
// DEF_3(int, ReadPixels, int*, int, void*)
DEF_3(int, Project, int, gl_fc3vertex_t*, gl_fc3vertex_t*)
DEF_3(int, ChangeVideoMode, int, int, int)
DEF_4(int, CreateContext, int, int, int, int)
Expand Down Expand Up @@ -242,7 +242,7 @@ void DD_RouteAPI(void)
ROUTE(Fog);
ROUTE(Fogv);
ROUTE(Project);
ROUTE(ReadPixels);
// ROUTE(ReadPixels);
#undef ROUTE
#endif
}
Expand Down Expand Up @@ -334,7 +334,7 @@ int DD_InitDGLDriver(void)
Req(Fog);
Req(Fogv);
Req(Project);
Req(ReadPixels);
// Req(ReadPixels);

DD_RouteAPI();

Expand Down

0 comments on commit 1638e69

Please sign in to comment.