Updated Visual Studio project file for Blargg code changes.

src/common/tv_filters/AtariNTSC.cxx

@@ -17,6 +17,18 @@
 
 #include "AtariNTSC.hxx"
 
+// blitter related
+#ifndef restrict
+  #if defined (__GNUC__)
+    #define restrict __restrict__
+  #elif defined (_MSC_VER) && _MSC_VER > 1300
+    #define restrict __restrict
+  #else
+    /* no support for restricted pointers */
+    #define restrict
+  #endif
+#endif
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void AtariNTSC::initialize(const Setup& setup, const uInt8* palette)
 {

src/common/tv_filters/AtariNTSC.hxx

@@ -261,18 +261,6 @@ class AtariNTSC
       out [1] = (unsigned char) (clamped >> 11);\
       out [2] = (unsigned char) (clamped >>  1);\
     }
-
-    // blitter related
-    #ifndef restrict
-      #if defined (__GNUC__)
-        #define restrict __restrict__
-      #elif defined (_MSC_VER) && _MSC_VER > 1300
-        #define restrict __restrict
-      #else
-        /* no support for restricted pointers */
-        #define restrict
-      #endif
-    #endif
 };
 
 #endif

src/windows/Stella.vcxproj

@@ -235,7 +235,7 @@
     <ClCompile Include="..\common\FSNodeZIP.cxx" />
     <ClCompile Include="..\common\main.cxx" />
     <ClCompile Include="..\common\MouseControl.cxx" />
-    <ClCompile Include="..\common\tv_filters\atari_ntsc.cxx" />
+    <ClCompile Include="..\common\tv_filters\AtariNTSC.cxx" />
     <ClCompile Include="..\common\tv_filters\NTSCFilter.cxx" />
     <ClCompile Include="..\common\ZipHandler.cxx" />
     <ClCompile Include="..\debugger\gui\AtariVoxWidget.cxx" />
@@ -504,8 +504,7 @@
     <ClInclude Include="..\common\MouseControl.hxx" />
     <ClInclude Include="..\common\StellaKeys.hxx" />
     <ClInclude Include="..\common\StringParser.hxx" />
-    <ClInclude Include="..\common\tv_filters\atari_ntsc.hxx" />
+    <ClInclude Include="..\common\tv_filters\AtariNTSC.hxx" />
-    <ClInclude Include="..\common\tv_filters\atari_ntsc_impl.hxx" />
     <ClInclude Include="..\common\tv_filters\NTSCFilter.hxx" />
     <ClInclude Include="..\common\UniquePtr.hxx" />
     <ClInclude Include="..\common\Variant.hxx" />

src/windows/Stella.vcxproj.filters

@@ -762,9 +762,6 @@
     <ClCompile Include="..\common\main.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\tv_filters\atari_ntsc.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\emucore\CartWD.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
@@ -846,6 +843,9 @@
     <ClCompile Include="..\debugger\gui\DelayQueueWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\tv_filters\AtariNTSC.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\bspf.hxx">
@@ -1610,12 +1610,6 @@
     <ClInclude Include="..\debugger\gui\CartMDMWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\tv_filters\atari_ntsc.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common\tv_filters\atari_ntsc_impl.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\Vec.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1721,6 +1715,9 @@
     <ClInclude Include="..\emucore\tia\DelayQueueIteratorImpl.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\tv_filters\AtariNTSC.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="stella.ico">