Allow the src\m68000\obj directory in the repository

Operation to allow missing source files in the src\m68000\obj directory

diff --git a/.gitignore b/.gitignore
index 819e5f7..aba64a3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,10 @@ Screenshots/
 software/\r
 src/*~\r
 src/*/*.bak\r
 software/\r
 src/*~\r
 src/*/*.bak\r

-src/m68000/obj/\r
-src/m68000/*~\r
+src/m68000/obj/*.a\r
+src/m68000/obj/*.exe\r
+src/m68000/obj/*.d\r
+src/m68000/obj/*.o\r

 VS2015/x64/Archives/\r
 VS2015/*/x64/\r
 VS2015/*/*_VS2015-DebugSetup.txt\r
 VS2015/x64/Archives/\r
 VS2015/*/x64/\r
 VS2015/*/*_VS2015-DebugSetup.txt\r


@@ -28,4 +30,4 @@ virtualjaguar.WinMerge
 VS2015/virtualjaguar.VC.db\r
 VS2015/virtualjaguar.VC.VC.opendb\r
 VS2015/virtualjaguar.sdf\r
 VS2015/virtualjaguar.VC.db\r
 VS2015/virtualjaguar.VC.VC.opendb\r
 VS2015/virtualjaguar.sdf\r

-\r
+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 (file)
--- 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" />
   <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>
     <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 (file)
--- 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\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">
   </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 (file)
--- a/VS2015/virtualjaguar.vcxproj.user
+++ b/VS2015/virtualjaguar.vcxproj.user
@@ -7,7 +7,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>\r
     <QTDIR>C:\Qt\Qt5.5.1\msvc2015_64</QTDIR>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>\r
     <QTDIR>C:\Qt\Qt5.5.1\msvc2015_64</QTDIR>\r

-    <LocalDebuggerCommandArguments>C:\Projects\GLib-M68K\Lib-Test-M68K\Debug\LibTestM68K_Debug.elf --debugger --no-log</LocalDebuggerCommandArguments>\r
+    <LocalDebuggerCommandArguments>C:\Projects\GLib-M68K\Lib-Test-M68K\Debug\LibTestM68K_Debug.elf --debugger</LocalDebuggerCommandArguments>\r

     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>\r
     <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>\r
   </PropertyGroup>\r
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>\r
     <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>\r
   </PropertyGroup>\r

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index 2ab01c0..3200468 100644 (file)
--- 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)\r
        BOOL(WINAPI * AttachConsole)(DWORD dwProcessId);\r
 \r
 #if defined (__GCCWIN32__) || defined (_MSC_VER)\r
        BOOL(WINAPI * AttachConsole)(DWORD dwProcessId);\r
 \r

-       AttachConsole = (BOOL (WINAPI *)(DWORD))\r
-               GetProcAddress(LoadLibraryA("kernel32.dll"), "AttachConsole");\r
+       AttachConsole = (BOOL (WINAPI *)(DWORD))GetProcAddress(LoadLibraryA("kernel32.dll"), "AttachConsole");\r

 \r
        if (AttachConsole != NULL && AttachConsole(((DWORD)-1)))\r
        {\r
 \r
        if (AttachConsole != NULL && AttachConsole(((DWORD)-1)))\r
        {\r