From e9049c3e14dd967611d9b06a47d0b8672819504a Mon Sep 17 00:00:00 2001
From: Jean-Paul Mari <djipi.mari@gmail.com>
Date: Wed, 11 Oct 2017 09:47:15 -0400
Subject: [PATCH] Allow the src\m68000\obj directory in the repository

Operation to allow missing source files in the src\m68000\obj directory
---
 .gitignore                           | 8 +++++---
 VS2015/m68000/m68000.vcxproj         | 1 +
 VS2015/m68000/m68000.vcxproj.filters | 3 +++
 VS2015/virtualjaguar.vcxproj.user    | 2 +-
 src/gui/app.cpp                      | 3 +--
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 819e5f7..aba64a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,10 @@ Screenshots/
 software/
 src/*~
 src/*/*.bak
-src/m68000/obj/
-src/m68000/*~
+src/m68000/obj/*.a
+src/m68000/obj/*.exe
+src/m68000/obj/*.d
+src/m68000/obj/*.o
 VS2015/x64/Archives/
 VS2015/*/x64/
 VS2015/*/*_VS2015-DebugSetup.txt
@@ -28,4 +30,4 @@ virtualjaguar.WinMerge
 VS2015/virtualjaguar.VC.db
 VS2015/virtualjaguar.VC.VC.opendb
 VS2015/virtualjaguar.sdf
-
+VS2015/virtualjaguar.vcxproj.user
\ No newline at end of file
diff --git a/VS2015/m68000/m68000.vcxproj b/VS2015/m68000/m68000.vcxproj
index 994ec05..957d362 100644
--- a/VS2015/m68000/m68000.vcxproj
+++ b/VS2015/m68000/m68000.vcxproj
@@ -149,6 +149,7 @@
   <ItemGroup>
     <ClInclude Include="..\..\src\m68000\cpudefs.h" />
     <ClInclude Include="..\..\src\m68000\m68kinterface.h" />
+    <ClInclude Include="..\..\src\m68000\obj\cputbl.h" />
     <ClInclude Include="..\..\src\m68000\sysdeps.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/VS2015/m68000/m68000.vcxproj.filters b/VS2015/m68000/m68000.vcxproj.filters
index b54362a..24ea3c4 100644
--- a/VS2015/m68000/m68000.vcxproj.filters
+++ b/VS2015/m68000/m68000.vcxproj.filters
@@ -27,6 +27,9 @@
     <ClInclude Include="..\..\src\m68000\sysdeps.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\m68000\obj\cputbl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\m68000\obj\cpudefs.c">
diff --git a/VS2015/virtualjaguar.vcxproj.user b/VS2015/virtualjaguar.vcxproj.user
index 315a626..e9edadc 100644
--- a/VS2015/virtualjaguar.vcxproj.user
+++ b/VS2015/virtualjaguar.vcxproj.user
@@ -7,7 +7,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
     <QTDIR>C:\Qt\Qt5.5.1\msvc2015_64</QTDIR>
-    <LocalDebuggerCommandArguments>C:\Projects\GLib-M68K\Lib-Test-M68K\Debug\LibTestM68K_Debug.elf --debugger --no-log</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>C:\Projects\GLib-M68K\Lib-Test-M68K\Debug\LibTestM68K_Debug.elf --debugger</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index 2ab01c0..3200468 100644
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -61,8 +61,7 @@ int main(int argc, char * argv[])
 #if defined (__GCCWIN32__) || defined (_MSC_VER)
 	BOOL(WINAPI * AttachConsole)(DWORD dwProcessId);
 
-	AttachConsole = (BOOL (WINAPI *)(DWORD))
-		GetProcAddress(LoadLibraryA("kernel32.dll"), "AttachConsole");
+	AttachConsole = (BOOL (WINAPI *)(DWORD))GetProcAddress(LoadLibraryA("kernel32.dll"), "AttachConsole");
 
 	if (AttachConsole != NULL && AttachConsole(((DWORD)-1)))
 	{
-- 
2.20.1