diff --git a/.gitignore b/.gitignore index 41fa12e..4f57601 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -*.props *.user *.suo *.ncb @@ -8,6 +7,7 @@ *.plg *.opt *.db +*.opensdf .vs/ debug/ debugaxp/ diff --git a/_Common.props b/_Common.props new file mode 100644 index 0000000..c0d6223 --- /dev/null +++ b/_Common.props @@ -0,0 +1,17 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Common Project Properties + ..\build\$(PlatformName)\$(Configuration)\ + ..\build\$(PlatformName)\$(Configuration)\intermediate\$(ProjectName)\ + + + + WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + Level4 + + + + + \ No newline at end of file diff --git a/_Curl.props b/_Curl.props new file mode 100644 index 0000000..526cb4e --- /dev/null +++ b/_Curl.props @@ -0,0 +1,13 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Curl Library + + + + Level3 + USRDLL;CURLLIB_EXPORTS;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/_Debug.props b/_Debug.props new file mode 100644 index 0000000..2dfd142 --- /dev/null +++ b/_Debug.props @@ -0,0 +1,24 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Debug + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + false + MultiThreadedDebug + true + ProgramDatabase + + + libcmtd.lib;%(AdditionalDependencies) + libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + + + \ No newline at end of file diff --git a/_Dedicated.props b/_Dedicated.props new file mode 100644 index 0000000..cea663f --- /dev/null +++ b/_Dedicated.props @@ -0,0 +1,12 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dedicated + + + + ID_DEDICATED;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/_DoomDLL.props b/_DoomDLL.props new file mode 100644 index 0000000..8461f0e --- /dev/null +++ b/_DoomDLL.props @@ -0,0 +1,26 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Doom III Executable + + + + sound/vorbis/include;%(AdditionalIncludeDirectories) + __DOOM__;__DOOM_DLL__;%(PreprocessorDefinitions) + + + Level3 + + + dbghelp.lib;dinput8.lib;dsound.lib;dxguid.lib;DxErr.lib;eaxguid.lib;glu32.lib;iphlpapi.lib;odbc32.lib;odbccp32.lib;opengl32.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) + C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Lib\x86;openal\lib;sys\win32\dongle;%(AdditionalLibraryDirectories) + $(OutDir)DOOM3.exe + %(AdditionalManifestDependencies) + Windows + 16777216 + 16777216 + true + + + \ No newline at end of file diff --git a/_Game-d3xp.props b/_Game-d3xp.props new file mode 100644 index 0000000..b7309e6 --- /dev/null +++ b/_Game-d3xp.props @@ -0,0 +1,20 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Game d3xp Library + + + + __DOOM__;GAME_DLL;_D3XP;CTF;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + $(OutDir)gamex86.dll + .\d3xp\game.def + + + ..\build\Win32\"$(Configuration)"\TypeInfo.exe + + + \ No newline at end of file diff --git a/_Game.props b/_Game.props new file mode 100644 index 0000000..c8a0402 --- /dev/null +++ b/_Game.props @@ -0,0 +1,22 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Game Library + + + + __DOOM__;GAME_DLL;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + + + $(OutDir)gamex86.dll + .\game\game.def + + + ..\build\Win32\"$(Configuration)"\TypeInfo.exe + + + \ No newline at end of file diff --git a/_MayaImport.props b/_MayaImport.props new file mode 100644 index 0000000..711467c --- /dev/null +++ b/_MayaImport.props @@ -0,0 +1,19 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>MayaImport Library + + + + mssdk/include;MayaImport/Maya5.0;%(AdditionalIncludeDirectories) + _USRDLL;MAYAIMPORT_EXPORTS;MAYA_IMPORT;REQUIRE_IOSTREAM;%(PreprocessorDefinitions) + Use + Level3 + + + Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;%(AdditionalDependencies) + MayaImport/maya5.0/libs;%(AdditionalLibraryDirectories) + + + \ No newline at end of file diff --git a/_Release.props b/_Release.props new file mode 100644 index 0000000..d46db3b --- /dev/null +++ b/_Release.props @@ -0,0 +1,30 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Release + + + + MaxSpeed + AnySuitable + true + true + NDEBUG;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + ProgramDatabase + + + libcmt.lib;%(AdditionalDependencies) + libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + false + true + true + + + \ No newline at end of file diff --git a/_TypeInfo.props b/_TypeInfo.props new file mode 100644 index 0000000..464ead9 --- /dev/null +++ b/_TypeInfo.props @@ -0,0 +1,16 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>TypeInfo + + + + ID_ENABLE_CURL=0;ID_TYPEINFO;__DOOM_DLL__;%(PreprocessorDefinitions) + Use + + + Console + + + \ No newline at end of file diff --git a/_WithInlines.props b/_WithInlines.props new file mode 100644 index 0000000..ac88a6a --- /dev/null +++ b/_WithInlines.props @@ -0,0 +1,13 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>With Inlines + + + + OnlyExplicitInline + _INLINEDEBUG;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/_WithMemoryLog.props b/_WithMemoryLog.props new file mode 100644 index 0000000..79867b5 --- /dev/null +++ b/_WithMemoryLog.props @@ -0,0 +1,12 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>With Memory Log + + + + ID_REDIRECT_NEWDELETE;ID_DEBUG_MEMORY;ID_DEBUG_UNINITIALIZED_MEMORY;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/_idlib.props b/_idlib.props new file mode 100644 index 0000000..3d7dc2f --- /dev/null +++ b/_idlib.props @@ -0,0 +1,13 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>idlib + + + + __IDLIB__;%(PreprocessorDefinitions) + Use + + + \ No newline at end of file diff --git a/quadcow.sln b/quadcow.sln index 41e1321..3bbe464 100644 --- a/quadcow.sln +++ b/quadcow.sln @@ -1,7 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "game.vcxproj", "{49BEC5C6-B964-417A-851E-808886B57430}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "idLib", "idlib.vcxproj", "{49BEC5C6-B964-417A-851E-808886B57400}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CurlLib", "curllib.vcxproj", "{F46F5D4E-C1D4-4ADE-9FAA-5F0CE3AA07F1}" @@ -13,8 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DoomDLL", "doomdll.vcxproj" {0BC6FCC9-C65E-4B1F-9A58-0B9399987C9F} = {0BC6FCC9-C65E-4B1F-9A58-0B9399987C9F} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MayaImport", "MayaImport.vcxproj", "{49BEC5C6-B964-417A-851E-808886B574F1}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game-d3xp", "game-d3xp.vcxproj", "{0BC6FCC9-C65E-4B1F-9A58-0B9399987C9F}" EndProject Global @@ -29,19 +25,6 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {49BEC5C6-B964-417A-851E-808886B57430}.Debug with inlines and memory log|Win32.ActiveCfg = Debug with inlines and memory log|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Debug with inlines and memory log|Win32.Build.0 = Debug with inlines and memory log|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Debug with inlines|Win32.ActiveCfg = Debug with inlines|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Debug with inlines|Win32.Build.0 = Debug with inlines|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Debug|Win32.ActiveCfg = Debug|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Dedicated Debug with inlines|Win32.ActiveCfg = Dedicated Debug with inlines|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Dedicated Debug with inlines|Win32.Build.0 = Dedicated Debug with inlines|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Dedicated Debug|Win32.ActiveCfg = Dedicated Debug|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Dedicated Debug|Win32.Build.0 = Dedicated Debug|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Dedicated Release|Win32.ActiveCfg = Dedicated Release|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Dedicated Release|Win32.Build.0 = Dedicated Release|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Release NO STEAM|Win32.ActiveCfg = Release|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Release|Win32.ActiveCfg = Release|Win32 {49BEC5C6-B964-417A-851E-808886B57400}.Debug with inlines and memory log|Win32.ActiveCfg = Debug with inlines and memory log|Win32 {49BEC5C6-B964-417A-851E-808886B57400}.Debug with inlines and memory log|Win32.Build.0 = Debug with inlines and memory log|Win32 {49BEC5C6-B964-417A-851E-808886B57400}.Debug with inlines|Win32.ActiveCfg = Debug with inlines|Win32 @@ -103,14 +86,6 @@ Global {49BEC5C6-B964-417A-851E-808886B57420}.Release NO STEAM|Win32.Build.0 = Release NO STEAM|Win32 {49BEC5C6-B964-417A-851E-808886B57420}.Release|Win32.ActiveCfg = Release|Win32 {49BEC5C6-B964-417A-851E-808886B57420}.Release|Win32.Build.0 = Release|Win32 - {49BEC5C6-B964-417A-851E-808886B574F1}.Debug with inlines and memory log|Win32.ActiveCfg = Debug with inlines and memory log|Win32 - {49BEC5C6-B964-417A-851E-808886B574F1}.Debug with inlines|Win32.ActiveCfg = Debug with inlines|Win32 - {49BEC5C6-B964-417A-851E-808886B574F1}.Debug|Win32.ActiveCfg = Debug|Win32 - {49BEC5C6-B964-417A-851E-808886B574F1}.Dedicated Debug with inlines|Win32.ActiveCfg = Dedicated Debug with inlines|Win32 - {49BEC5C6-B964-417A-851E-808886B574F1}.Dedicated Debug|Win32.ActiveCfg = Dedicated Debug|Win32 - {49BEC5C6-B964-417A-851E-808886B574F1}.Dedicated Release|Win32.ActiveCfg = Dedicated Release|Win32 - {49BEC5C6-B964-417A-851E-808886B574F1}.Release NO STEAM|Win32.ActiveCfg = Release NO STEAM|Win32 - {49BEC5C6-B964-417A-851E-808886B574F1}.Release|Win32.ActiveCfg = Release|Win32 {0BC6FCC9-C65E-4B1F-9A58-0B9399987C9F}.Debug with inlines and memory log|Win32.ActiveCfg = Debug with inlines and memory log|Win32 {0BC6FCC9-C65E-4B1F-9A58-0B9399987C9F}.Debug with inlines|Win32.ActiveCfg = Debug with inlines|Win32 {0BC6FCC9-C65E-4B1F-9A58-0B9399987C9F}.Debug|Win32.ActiveCfg = Debug|Win32