Amputated remnants of some legacy features.

.gitignore

@@ -221,6 +221,13 @@ $RECYCLE.BIN/
 # Files created by make in various subdirectories
 .dirstamp
 
+# =====================
+# POV-Ray Miscellaneous
+# =====================
+
+/internal/
+/legacy-license/
+
 # =========================
 # POV-Ray Doxygen artefacts
 # =========================

platform/windows/syspovtask.cpp

@@ -58,27 +58,19 @@ void WinMemThreadCleanup();
 namespace vfePlatform
 {
 
-// implemented in `vfe/win/cpuinfo.cpp`
-// TODO - Move the implementation into `platform/windows` somewhere.
-extern bool GetCPUCount(unsigned int *TotAvailLogical, unsigned int *TotAvailCore, unsigned int *PhysicalNum);
-
 // TODO - Maybe move this somewhere else as well.
-static int GetNumberofCPUs (void)
+static unsigned int GetNumberofCPUs (void)
 {
-    unsigned    logical;
-    unsigned    cores;
-    unsigned    physical;
-    SYSTEM_INFO sysinfo;
-    static int  result = -1;
+    SYSTEM_INFO         sysinfo;
+    static unsigned int result = 0;
 
     // we cache the result, since this function is called on each thread startup
-    if (result != -1)
+    // TODO - this isn't ideal on systems with hot-pluggable CPUs
+    if (result != 0)
       return result;
 
     GetSystemInfo (&sysinfo) ;
     result = sysinfo.dwNumberOfProcessors;
-    if (GetCPUCount(&logical, &cores, &physical))
-        result = cores;
     return result;
 }
 
@@ -98,9 +90,11 @@ using namespace vfePlatform;
 void Task::Initialize ()
 {
     // NB This is not thread-safe, but we currently don't care.
-    static volatile int count = 0;
-    if (GetNumberofCPUs() > 1)
-        SetThreadIdealProcessor (GetCurrentThread(), (count++ % GetNumberofCPUs()) + 1);
+    static volatile unsigned int count = 0;
+    unsigned int numCPUs = GetNumberofCPUs();
+    // TODO - if numCPUs > 64, we need to do more than this
+    if (numCPUs > 1)
+        SetThreadIdealProcessor (GetCurrentThread(), (count++) % numCPUs);
 #ifndef _CONSOLE
     povwin::WinMemThreadStartup();
 #endif

source/backend/povray.cpp

@@ -288,7 +288,7 @@ void BuildInitInfo(POVMSObjectPtr msg)
         err = POVMSUtil_SetString(msg, kPOVAttrib_EnglishText,
                                   DISTRIBUTION_MESSAGE_1 "\n" DISTRIBUTION_MESSAGE_2 "\n" DISTRIBUTION_MESSAGE_3
                                   "\nPOV-Ray is based on DKBTrace 2.12 by David K. Buck & Aaron A. Collins\n" POV_RAY_COPYRIGHT);
-#if POV_RAY_IS_OFFICIAL == 1
+#if POV_RAY_IS_OFFICIAL
     if(err == kNoErr)
         err = POVMSUtil_SetBool(msg, kPOVAttrib_Official, true);
 #else

source/backend/povray.h

@@ -76,19 +76,19 @@ bool povray_terminated();
 
 // POV-Ray version and copyright message macros
 
-#if POV_RAY_IS_OFFICIAL == 1
+#if POV_RAY_IS_OFFICIAL
 
-#if POV_RAY_IS_AUTOBUILD == 1
+#if POV_RAY_IS_AUTOBUILD
 #define DISTRIBUTION_MESSAGE_1 "This is an official automated build authorized by the POV-Ray Team."
 #else // POV_RAY_IS_AUTOBUILD
 #define DISTRIBUTION_MESSAGE_1 "This is an official version prepared by the POV-Ray Team."
 #endif // POV_RAY_IS_AUTOBUILD
 #define DISTRIBUTION_MESSAGE_2 " See the documentation on how to contact the authors or visit us"
 #define DISTRIBUTION_MESSAGE_3 " on the internet at http://www.povray.org/\n"
 
-#elif POV_RAY_IS_SEMI_OFFICIAL == 1
+#elif POV_RAY_IS_SEMI_OFFICIAL
 
-#if POV_RAY_IS_AUTOBUILD == 1
+#if POV_RAY_IS_AUTOBUILD
 #define DISTRIBUTION_MESSAGE_1 "This is an automated development build authorized by:"
 #else // POV_RAY_IS_AUTOBUILD
 #define DISTRIBUTION_MESSAGE_1 "This is a development version compiled by:"
@@ -107,10 +107,14 @@ bool povray_terminated();
 #define DISCLAIMER_MESSAGE_1 "This is free software; see the source for copying conditions.  There is NO"
 #define DISCLAIMER_MESSAGE_2 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
-#if (POV_RAY_IS_OFFICIAL == 1) && (POV_RAY_IS_AUTOBUILD != 1)
-#define POV_RAY_HAS_OFFICIAL_FEATURES 1
+#if POV_RAY_IS_OFFICIAL && !POV_RAY_IS_AUTOBUILD
+// manual official builds do have these fancy features
+#define POV_RAY_HAS_CRASHDUMP_UPLOAD 1
+#define POV_RAY_HAS_UPDATE_CHECK 1
 #else
-#define POV_RAY_HAS_OFFICIAL_FEATURES 0
+// auto-builds or manual unofficial builds never have these fancy features
+#define POV_RAY_HAS_CRASHDUMP_UPLOAD 0
+#define POV_RAY_HAS_UPDATE_CHECK 0
 #endif
 
 #endif // POVRAY_BACKEND_POVRAY_H

source/base/version.h

@@ -66,13 +66,13 @@
 
 /// @def POV_RAY_VERSION
 /// Full version string.
-#if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
+#if POV_RAY_IS_AUTOBUILD && (POV_RAY_IS_OFFICIAL || POV_RAY_IS_SEMI_OFFICIAL)
 #ifdef POV_RAY_PRERELEASE
 #define POV_RAY_VERSION OFFICIAL_VERSION_STRING "-" POV_RAY_PRERELEASE "+" POV_RAY_AUTOBUILD_ID
 #else
 #define POV_RAY_VERSION OFFICIAL_VERSION_STRING "+" POV_RAY_AUTOBUILD_ID
 #endif
-#elif (POV_RAY_IS_OFFICIAL == 1)
+#elif POV_RAY_IS_OFFICIAL
 #ifdef POV_RAY_PRERELEASE
 #define POV_RAY_VERSION OFFICIAL_VERSION_STRING "-" POV_RAY_PRERELEASE
 #else

source/parser/parser_tokenizer.cpp

@@ -2398,7 +2398,7 @@ void Parser::Parse_Directive(int After_Hash)
                             parsingVersionDirective = true;
                             EXPECT_ONE
                                 CASE (UNOFFICIAL_TOKEN)
-#if POV_RAY_IS_OFFICIAL == 1
+#if POV_RAY_IS_OFFICIAL
                                     Get_Token();
                                     Error("This file was created for an unofficial version and\ncannot work as-is with this official version.");
 #else

windows/pvengine.cpp

@@ -127,11 +127,6 @@ namespace pov_frontend
   extern shared_ptr<Display> gDisplay;
 }
 
-namespace vfePlatform
-{
-  extern bool GetCPUCount(unsigned int *TotAvailLogical, unsigned int *TotAvailCore, unsigned int *PhysicalNum);
-}
-
 using namespace pov;
 using namespace pov_frontend;
 
@@ -354,9 +349,6 @@ unsigned                on_completion = CM_COMPLETION_NOTHING ;
 unsigned                window_count = 0 ;
 unsigned                ThreadCount = 2 ;
 unsigned                NumberOfCPUs ;
-unsigned                NumLogicalCPUs ;
-unsigned                NumCPUCores ;
-unsigned                NumPhysicalCPUs ;
 HPALETTE                hPalApp ;
 HPALETTE                hPalBitmap ;
 COLORREF                background_colour ;
@@ -1690,7 +1682,7 @@ char *GetExceptionDescription (DWORD code)
   }
 }
 
-#if POV_RAY_HAS_OFFICIAL_FEATURES == 1
+#if POV_RAY_HAS_CRASHDUMP_UPLOAD
 // this pulls in the code for update checks and crash dump submission.
 // it is only used in official releases made by the POV-Ray developers,
 // so the source is not included in the public distribution.
@@ -1739,7 +1731,7 @@ LONG WINAPI ExceptionHandler(struct _EXCEPTION_POINTERS* ExceptionInfo)
   ExitProcess (1) ;
   return (EXCEPTION_CONTINUE_SEARCH) ; // make compiler happy
 }
-#endif // POV_RAY_HAS_OFFICIAL_FEATURES
+#endif // POV_RAY_HAS_CRASHDUMP_UPLOAD
 
 int execute_tool (char *s)
 {
@@ -2715,7 +2707,7 @@ void WIN_Debug_Log (unsigned int from, const char *msg)
     OutputDebugString (msg) ;
 }
 
-#if POV_RAY_IS_OFFICIAL != 1
+#if !POV_RAY_IS_OFFICIAL
 void WIN_PrintOtherCredits (void)
 {
   char        *s = DISTRIBUTION_MESSAGE_2 ;
@@ -3713,7 +3705,7 @@ bool handle_main_command (WPARAM wParam, LPARAM lParam)
          return (true) ;
 
     case CM_CHECKUPDATENOW:
-#if POV_RAY_HAS_OFFICIAL_FEATURES == 1
+#if POV_RAY_HAS_UPDATE_CHECK
          ManualUpdateCheck();
 #endif
          return true;
@@ -4182,7 +4174,7 @@ LRESULT CALLBACK PovMainWndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM
            break ;
          seconds++ ;
 
-#if POV_RAY_HAS_OFFICIAL_FEATURES == 1
+#if POV_RAY_HAS_UPDATE_CHECK
          if (seconds % 600 == 0)
            DoUpdateCheck () ;
 #endif
@@ -5318,7 +5310,6 @@ int PASCAL WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
   char                  str [_MAX_PATH * 2] ;
   char                  *s = szCmdLine ;
   bool                  exit_loop = false ;
-  bool                  have_cpu_info = false;
   unsigned              n ;
   MSG                   msg ;
   HDC                   hDC ;
@@ -5369,13 +5360,6 @@ int PASCAL WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
   ThreadCount = sysinfo.dwNumberOfProcessors ;
   NumberOfCPUs = sysinfo.dwNumberOfProcessors ;
 
-  if (GetCPUCount(&NumLogicalCPUs, &NumCPUCores, &NumPhysicalCPUs) && NumLogicalCPUs > 1)
-  {
-    have_cpu_info = true;
-    ThreadCount = NumLogicalCPUs ;
-    NumberOfCPUs = NumCPUCores ;
-  }
-
   while (*s == ' ' || *s == '\t')
     s++ ;
   if (_stricmp (s, "/install") == 0 || _strnicmp (s, "/install ", 9) == 0 || _stricmp (s, "/qinstall") == 0 || _strnicmp (s, "/qinstall ", 10) == 0)
@@ -6111,7 +6095,7 @@ int PASCAL WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
   buffer_message (mIDE, "\n") ;
   strcpy (tool_commands [0], "notepad.exe \"%ipovray.ini\"") ;
 
-#if POV_RAY_IS_OFFICIAL != 1
+#if !POV_RAY_IS_OFFICIAL
   WIN_PrintOtherCredits () ;
   buffer_message (mIDE, "This unofficial build is derived from the POV-Ray for Windows source code.\n") ;
 #endif
@@ -6143,12 +6127,6 @@ int PASCAL WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
     update_queue_status (false) ;
   }
 
-  if (have_cpu_info)
-    message_printf("Detected %u CPU%s providing %u physical core%s and %u logical one%s.\n",
-                   NumPhysicalCPUs, NumPhysicalCPUs > 1 ? "'s" : "",
-                   NumCPUCores, NumCPUCores > 1 ? "s" : "",
-                   NumLogicalCPUs, NumLogicalCPUs > 1 ? "s" : "");
-
   buffer_message (mDivider, "\n") ;
 
   if (GetHKCU("General", "CheckColorsInc", 1) == 1)
@@ -6248,7 +6226,7 @@ int PASCAL WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
     }
   }
 
-#if POV_RAY_HAS_OFFICIAL_FEATURES == 1
+#if POV_RAY_HAS_UPDATE_CHECK
   DoUpdateCheck () ;
 #endif
 

windows/pvengine.h

@@ -91,7 +91,7 @@
 
 #define CRASH_REPORTER_EXECUTABLE "SubmitMinidump.exe"
 
-#if POV_RAY_IS_OFFICIAL == 1
+#if POV_RAY_IS_OFFICIAL
   #ifdef _WIN64
     #define CLASSNAMEPREFIX "Pov37-Win64-"
   #else

windows/pvmenu.cpp

@@ -10,7 +10,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -171,7 +171,8 @@ void init_menus (void)
     RemoveMenu (hPopupMenus, CM_RENDERPRIORITY_BACKGROUND, MF_BYCOMMAND);
   }
 
-#if POV_RAY_HAS_OFFICIAL_FEATURES != 1
+#if !POV_RAY_HAS_UPDATE_CHECK
+  // remove update check related menu items
   n = find_menuitem(hOptionsMenu, "&Update Checks") ;
   assert(n != -1) ;
   RemoveMenu (hOptionsMenu, n, MF_BYPOSITION);

windows/vs10/povray.vcxproj

@@ -124,7 +124,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\platform\x86;..\..\platform\windows;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\internal\windows;..\..\platform\x86;..\..\platform\windows;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0501;_WIN32_WINNT=0x0501;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -191,7 +191,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\platform\x86;..\..\platform\windows;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\internal\windows;..\..\platform\x86;..\..\platform\windows;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;BUILDING_AMD64=1;COMMONCTRL_VERSION=0x500;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -261,7 +261,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\..\platform\x86;..\..\platform\windows;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\internal\windows;..\..\platform\x86;..\..\platform\windows;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0501;_WIN32_WINNT=0x0501;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -328,7 +328,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\..\platform\x86;..\..\platform\windows;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\internal\windows;..\..\platform\x86;..\..\platform\windows;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;COMMONCTRL_VERSION=0x500;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -395,7 +395,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\..\platform\x86;..\..\platform\windows;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\internal\windows;..\..\platform\x86;..\..\platform\windows;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0501;_WIN32_WINNT=0x0501;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILD_SSE2=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -450,26 +450,6 @@
   <ItemGroup>
     <None Include="..\icons\pvengine-xp.ico" />
     <None Include="..\icons\renderwindow-xp.ico" />
-    <None Include="..\bitmaps\toolbar\4cmdline.bmp" />
-    <None Include="..\bitmaps\toolbar\4fileclose.bmp" />
-    <None Include="..\bitmaps\toolbar\4filenew.bmp" />
-    <None Include="..\bitmaps\toolbar\4fileopen.bmp" />
-    <None Include="..\bitmaps\toolbar\4filequeue.bmp" />
-    <None Include="..\bitmaps\toolbar\4filerender.bmp" />
-    <None Include="..\bitmaps\toolbar\4filesave.bmp" />
-    <None Include="..\bitmaps\toolbar\4goirtc.bmp" />
-    <None Include="..\bitmaps\toolbar\4gopovray.bmp" />
-    <None Include="..\bitmaps\toolbar\4helpcont.bmp" />
-    <None Include="..\bitmaps\toolbar\4helpirtccd.bmp" />
-    <None Include="..\bitmaps\toolbar\4helppovcd.bmp" />
-    <None Include="..\bitmaps\toolbar\4helppovray.bmp" />
-    <None Include="..\bitmaps\toolbar\4renderclose.bmp" />
-    <None Include="..\bitmaps\toolbar\4rendershow.bmp" />
-    <None Include="..\bitmaps\toolbar\4renderstop.bmp" />
-    <None Include="..\bitmaps\toolbar\4rerun.bmp" />
-    <None Include="..\bitmaps\toolbar\4sleep.bmp" />
-    <None Include="..\bitmaps\toolbar\4sourcefile.bmp" />
-    <None Include="..\bitmaps\toolbar\4systray.bmp" />
     <None Include="..\bitmaps\about.bmp" />
     <None Include="..\bitmaps\BACKGND1.BMP" />
     <None Include="..\bitmaps\BACKGND2.BMP" />
@@ -499,7 +479,6 @@
     <None Include="..\bitmaps\toolbar\rerun.bmp" />
     <None Include="..\bitmaps\toolbar\sleep.bmp" />
     <None Include="..\bitmaps\toolbar\sourcefile.bmp" />
-    <None Include="..\bitmaps\splash-3.5.bmp" />
     <None Include="..\bitmaps\StretchDIBits.bmp" />
     <None Include="..\bitmaps\toolbar\SysTray.bmp" />
     <None Include="..\readme.html" />