From 5617db8dba9ea00bb777f513d89cb39650b76817 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Wed, 17 Sep 2008 20:51:15 +0000 Subject: [PATCH] - Fixed: Game files that were excluded from building in r1226 were still included for x64 configurations. (Though I honestly don't notice a difference in compiling time with VC++. GCC, yes, but GCC is still slow--thank goodness for parallel makes and now-commonplace multicore processors.) SVN r1233 (trunk) --- src/doomtype.h | 8 + zdoom.vcproj | 1661 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 1443 insertions(+), 226 deletions(-) diff --git a/src/doomtype.h b/src/doomtype.h index d7ea6ec78..72feddbc7 100644 --- a/src/doomtype.h +++ b/src/doomtype.h @@ -170,6 +170,14 @@ struct PalEntry #endif }; +// Screenshot buffer image data types +enum ESSType +{ + SS_PAL, + SS_RGB, + SS_BGRA +}; + #ifndef M_PI #define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h #endif diff --git a/zdoom.vcproj b/zdoom.vcproj index 0fdd086af..b64b0f1d5 100644 --- a/zdoom.vcproj +++ b/zdoom.vcproj @@ -1,7 +1,7 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -940,23 +950,13 @@ Outputs=""src/$(InputName).h"" /> - - - @@ -1551,16 +1551,6 @@ Outputs="$(IntDir)\$(InputName).obj" /> - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - @@ -1801,6 +1793,14 @@ Outputs="$(IntDir)/$(InputName).obj" /> + + + @@ -1966,6 +1966,14 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + @@ -1976,14 +1984,6 @@ Outputs="$(IntDir)\$(InputName).obj" /> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4075,14 +5292,6 @@ AdditionalIncludeDirectories="src\win32;$(NoInherit)" /> - - - @@ -4361,7 +5570,7 @@ />