Trying to untangle the horrible web of file dependencies

src/drivers/win/args.cpp

@@ -18,8 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "main.h"
+#include "args.h"
+#include "common.h"
 #include "../common/args.h"
 
+// TODO: Parsing arguments needs to be improved a lot. A LOT.
+
 /**
 * Parses commandline arguments
 **/

src/drivers/win/main.cpp

@@ -51,6 +51,7 @@
 #include "cdlogger.h"
 
 #include "basicbot.h"
+#include "args.h"
 
 // #defines
 
@@ -102,7 +103,7 @@ void ApplyDefaultCommandMapping(void);
 // Internal variables
 
 uint8 *xbsave = NULL;
-int eoptions=EO_BGRUN | EO_FORCEISCALE;
+int eoptions = EO_BGRUN | EO_FORCEISCALE;
 
 /**
 * Handle of the main window.
@@ -442,7 +443,6 @@ void DoPriority(void)
 #include "video.cpp"
 #include "window.cpp"
 #include "config.cpp"
-#include "args.cpp"
 
 int DriverInitialize()
 {

src/drivers/win/main.h

@@ -0,0 +1,4 @@
+static int genie;
+static int pal_emulation;
+static int status_icon;
+extern int eoptions;

vc8/fceux.vcproj

@@ -694,6 +694,32 @@
 			<Filter
 				Name="win"
 				>
+				<File
+					RelativePath="..\src\drivers\win\args.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\drivers\win\args.h"
+					>
+				</File>
 				<File
 					RelativePath="..\src\drivers\win\aviout.cpp"
 					>
@@ -854,6 +880,10 @@
 					RelativePath="..\src\drivers\win\main.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\src\drivers\win\main.h"
+					>
+				</File>
 				<File
 					RelativePath="..\src\drivers\win\memview.cpp"
 					>