From be91ec36e2f3e6ad2cda26ca790aa211ae690a7a Mon Sep 17 00:00:00 2001 From: Lance Date: Fri, 15 Jul 2011 12:41:09 +0000 Subject: [PATCH] Tweaked VC6 project file, added MSVC10 (dotnet2010) & MSVC9 (dotnet2008) project files. Also header fix for MSVC9 and beyond. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3874 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- fteqtv/dotnet2008/qtvprox.sln | 23 + fteqtv/dotnet2008/qtvprox.vcproj | 1308 +++++++++++++++++++++++++++++ fteqtv/dotnet2010/qtvprox.sln | 23 + fteqtv/dotnet2010/qtvprox.vcxproj | 484 +++++++++++ fteqtv/qtv.h | 25 +- fteqtv/{ => vc6}/qtvprox.dsp | 76 +- fteqtv/{ => vc6}/qtvprox.dsw | 0 7 files changed, 1889 insertions(+), 50 deletions(-) create mode 100644 fteqtv/dotnet2008/qtvprox.sln create mode 100644 fteqtv/dotnet2008/qtvprox.vcproj create mode 100644 fteqtv/dotnet2010/qtvprox.sln create mode 100644 fteqtv/dotnet2010/qtvprox.vcxproj rename fteqtv/{ => vc6}/qtvprox.dsp (89%) rename fteqtv/{ => vc6}/qtvprox.dsw (100%) diff --git a/fteqtv/dotnet2008/qtvprox.sln b/fteqtv/dotnet2008/qtvprox.sln new file mode 100644 index 000000000..d39e4891d --- /dev/null +++ b/fteqtv/dotnet2008/qtvprox.sln @@ -0,0 +1,23 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtvprox", "qtvprox.vcproj", "{C48D7446-3CCC-4844-AD39-A99626B890A9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Viewer Debug|Win32 = Viewer Debug|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Debug|Win32.ActiveCfg = Debug|Win32 + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Debug|Win32.Build.0 = Debug|Win32 + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Release|Win32.ActiveCfg = Release|Win32 + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Release|Win32.Build.0 = Release|Win32 + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Viewer Debug|Win32.ActiveCfg = Viewer Debug|Win32 + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Viewer Debug|Win32.Build.0 = Viewer Debug|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/fteqtv/dotnet2008/qtvprox.vcproj b/fteqtv/dotnet2008/qtvprox.vcproj new file mode 100644 index 000000000..1b69f3930 --- /dev/null +++ b/fteqtv/dotnet2008/qtvprox.vcproj @@ -0,0 +1,1308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fteqtv/dotnet2010/qtvprox.sln b/fteqtv/dotnet2010/qtvprox.sln new file mode 100644 index 000000000..145d52a1c --- /dev/null +++ b/fteqtv/dotnet2010/qtvprox.sln @@ -0,0 +1,23 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtvprox", "qtvprox.vcxproj", "{C48D7446-3CCC-4844-AD39-A99626B890A9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Viewer Debug|Win32 = Viewer Debug|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Debug|Win32.ActiveCfg = Debug|Win32 + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Debug|Win32.Build.0 = Debug|Win32 + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Release|Win32.ActiveCfg = Release|Win32 + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Release|Win32.Build.0 = Release|Win32 + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Viewer Debug|Win32.ActiveCfg = Viewer Debug|Win32 + {C48D7446-3CCC-4844-AD39-A99626B890A9}.Viewer Debug|Win32.Build.0 = Viewer Debug|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/fteqtv/dotnet2010/qtvprox.vcxproj b/fteqtv/dotnet2010/qtvprox.vcxproj new file mode 100644 index 000000000..c290cdb7e --- /dev/null +++ b/fteqtv/dotnet2010/qtvprox.vcxproj @@ -0,0 +1,484 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Viewer Debug + Win32 + + + + {C48D7446-3CCC-4844-AD39-A99626B890A9} + + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\Debug\ + .\Debug\ + true + .\Release\ + .\Release\ + false + .\qtvprox___Win32_Viewer_Debug\ + .\qtvprox___Win32_Viewer_Debug\ + true + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + .\Debug/qtvprox.tlb + + + + + Disabled + speex-1.2beta1\include;viewer\d3drend\sdkinc;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + qtv.h + .\Debug/qtvprox.pch + .\Debug/ + .\Debug/ + .\Debug/ + true + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + .\Debug/qtvprox.exe + true + true + .\Debug/qtvprox.pdb + Console + false + + + MachineX86 + + + true + .\Debug/qtvprox.bsc + + + + + .\Release/qtvprox.tlb + + + + + MaxSpeed + OnlyExplicitInline + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/qtvprox.pch + .\Release/ + .\Release/ + .\Release/ + true + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + .\Release/qtvprox.exe + true + .\Release/qtvprox.pdb + Console + false + + + MachineX86 + + + true + .\Release/qtvprox.bsc + + + + + .\qtvprox___Win32_Viewer_Debug/qtvprox.tlb + + + + + Disabled + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + qtv.h + .\qtvprox___Win32_Viewer_Debug/qtvprox.pch + .\qtvprox___Win32_Viewer_Debug/ + .\qtvprox___Win32_Viewer_Debug/ + .\qtvprox___Win32_Viewer_Debug/ + true + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + .\qtvprox___Win32_Viewer_Debug/qtvprox.exe + true + true + .\qtvprox___Win32_Viewer_Debug/qtvprox.pdb + Console + false + + + MachineX86 + + + true + .\qtvprox___Win32_Viewer_Debug/qtvprox.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + true + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fteqtv/qtv.h b/fteqtv/qtv.h index 1cb1d6a55..f70245969 100644 --- a/fteqtv/qtv.h +++ b/fteqtv/qtv.h @@ -100,18 +100,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct ip6_scope_id sin6_scope_struct; }; }; - - struct addrinfo - { - int ai_flags; - int ai_family; - int ai_socktype; - int ai_protocol; - size_t ai_addrlen; - char* ai_canonname; - struct sockaddr * ai_addr; - struct addrinfo * ai_next; - }; + #if !(_MSC_VER >= 1500) + struct addrinfo + { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + char* ai_canonname; + struct sockaddr * ai_addr; + struct addrinfo * ai_next; + }; + #endif #endif #ifdef _MSC_VER #pragma comment (lib, "wsock32.lib") diff --git a/fteqtv/qtvprox.dsp b/fteqtv/vc6/qtvprox.dsp similarity index 89% rename from fteqtv/qtvprox.dsp rename to fteqtv/vc6/qtvprox.dsp index 32ec6eba0..a59a2d958 100644 --- a/fteqtv/qtvprox.dsp +++ b/fteqtv/vc6/qtvprox.dsp @@ -120,7 +120,7 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=.\viewer\d3drend\d3d_backend.cpp +SOURCE=..\viewer\d3drend\d3d_backend.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -143,7 +143,7 @@ SOURCE=.\viewer\d3drend\d3d_backend.cpp # End Source File # Begin Source File -SOURCE=.\viewer\d3drend\d3d_image.cpp +SOURCE=..\viewer\d3drend\d3d_image.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -165,7 +165,7 @@ SOURCE=.\viewer\d3drend\d3d_image.cpp # End Source File # Begin Source File -SOURCE=.\viewer\d3drend\d3d_video.cpp +SOURCE=..\viewer\d3drend\d3d_video.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -188,7 +188,7 @@ SOURCE=.\viewer\d3drend\d3d_video.cpp # End Group # Begin Source File -SOURCE=.\viewer\cvar.cpp +SOURCE=..\viewer\cvar.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -210,7 +210,7 @@ SOURCE=.\viewer\cvar.cpp # End Source File # Begin Source File -SOURCE=.\viewer\gl_backend.cpp +SOURCE=..\viewer\gl_backend.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -232,7 +232,7 @@ SOURCE=.\viewer\gl_backend.cpp # End Source File # Begin Source File -SOURCE=.\viewer\gl_bsp29.cpp +SOURCE=..\viewer\gl_bsp29.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -254,7 +254,7 @@ SOURCE=.\viewer\gl_bsp29.cpp # End Source File # Begin Source File -SOURCE=.\viewer\gl_image.cpp +SOURCE=..\viewer\gl_image.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -276,7 +276,7 @@ SOURCE=.\viewer\gl_image.cpp # End Source File # Begin Source File -SOURCE=.\viewer\gl_mdl.cpp +SOURCE=..\viewer\gl_mdl.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -298,7 +298,7 @@ SOURCE=.\viewer\gl_mdl.cpp # End Source File # Begin Source File -SOURCE=.\viewer\gl_testgrid.cpp +SOURCE=..\viewer\gl_testgrid.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -320,7 +320,7 @@ SOURCE=.\viewer\gl_testgrid.cpp # End Source File # Begin Source File -SOURCE=.\viewer\gl_vidsdl.cpp +SOURCE=..\viewer\gl_vidsdl.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -342,7 +342,7 @@ SOURCE=.\viewer\gl_vidsdl.cpp # End Source File # Begin Source File -SOURCE=.\viewer\matrix.cpp +SOURCE=..\viewer\matrix.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -364,7 +364,7 @@ SOURCE=.\viewer\matrix.cpp # End Source File # Begin Source File -SOURCE=.\viewer\model.cpp +SOURCE=..\viewer\model.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -386,7 +386,7 @@ SOURCE=.\viewer\model.cpp # End Source File # Begin Source File -SOURCE=.\viewer\renderer.cpp +SOURCE=..\viewer\renderer.cpp !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -412,32 +412,32 @@ SOURCE=.\viewer\renderer.cpp # PROP Default_Filter "" # Begin Source File -SOURCE=.\sc_dsound.c +SOURCE=..\sc_dsound.c # End Source File # Begin Source File -SOURCE=.\sp_dsound.c +SOURCE=..\sp_dsound.c # End Source File # End Group # Begin Source File -SOURCE=.\bsp.c +SOURCE=..\bsp.c # End Source File # Begin Source File -SOURCE=.\control.c +SOURCE=..\control.c # End Source File # Begin Source File -SOURCE=.\crc.c +SOURCE=..\crc.c # End Source File # Begin Source File -SOURCE=.\forward.c +SOURCE=..\forward.c # End Source File # Begin Source File -SOURCE=.\libqtvc\glibc_sucks.c +SOURCE=..\libqtvc\glibc_sucks.c !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -452,23 +452,23 @@ SOURCE=.\libqtvc\glibc_sucks.c # End Source File # Begin Source File -SOURCE=.\httpsv.c +SOURCE=..\httpsv.c # End Source File # Begin Source File -SOURCE=.\mdfour.c +SOURCE=..\mdfour.c # End Source File # Begin Source File -SOURCE=.\menu.c +SOURCE=..\menu.c # End Source File # Begin Source File -SOURCE=.\msg.c +SOURCE=..\msg.c # End Source File # Begin Source File -SOURCE=.\libqtvc\msvc_sucks.c +SOURCE=..\libqtvc\msvc_sucks.c !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -483,7 +483,7 @@ SOURCE=.\libqtvc\msvc_sucks.c # End Source File # Begin Source File -SOURCE=.\netchan.c +SOURCE=..\netchan.c !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -501,7 +501,7 @@ SOURCE=.\netchan.c # End Source File # Begin Source File -SOURCE=.\parse.c +SOURCE=..\parse.c !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -519,11 +519,11 @@ SOURCE=.\parse.c # End Source File # Begin Source File -SOURCE=.\pmove.c +SOURCE=..\pmove.c # End Source File # Begin Source File -SOURCE=.\qw.c +SOURCE=..\qw.c !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -541,11 +541,11 @@ SOURCE=.\qw.c # End Source File # Begin Source File -SOURCE=.\rcon.c +SOURCE=..\rcon.c # End Source File # Begin Source File -SOURCE=.\source.c +SOURCE=..\source.c !IF "$(CFG)" == "qtvprox - Win32 Release" @@ -567,31 +567,31 @@ SOURCE=.\source.c # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\viewer\common.h +SOURCE=..\viewer\common.h # End Source File # Begin Source File -SOURCE=.\viewer\cvar.h +SOURCE=..\viewer\cvar.h # End Source File # Begin Source File -SOURCE=.\viewer\d3drend\d3drenderer.h +SOURCE=..\viewer\d3drend\d3drenderer.h # End Source File # Begin Source File -SOURCE=.\viewer\glrenderer.h +SOURCE=..\viewer\glrenderer.h # End Source File # Begin Source File -SOURCE=.\viewer\maths.h +SOURCE=..\viewer\maths.h # End Source File # Begin Source File -SOURCE=.\qtv.h +SOURCE=..\qtv.h # End Source File # Begin Source File -SOURCE=.\viewer\renderer.h +SOURCE=..\viewer\renderer.h # End Source File # End Group # Begin Group "Resource Files" diff --git a/fteqtv/qtvprox.dsw b/fteqtv/vc6/qtvprox.dsw similarity index 100% rename from fteqtv/qtvprox.dsw rename to fteqtv/vc6/qtvprox.dsw