Merge branch 'master' of https://github.com/djipi/Virtual-Jaguar-Rx
authorJean-Paul Mari <djipi.mari@gmail.com>
Sun, 5 Aug 2018 00:33:28 +0000 (20:33 -0400)
committerJean-Paul Mari <djipi.mari@gmail.com>
Sun, 5 Aug 2018 00:33:28 +0000 (20:33 -0400)
Win-VS2017/virtualjaguar.vcxproj
docs/vj_ReleaseNotes.txt
src/debugger/debuggertab.cpp

index 14377c1..bbba88f 100644 (file)
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
     </ClCompile>\r
-    <ClCompile Include="GeneratedFiles\Release\moc_debuggertab.cpp">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Release\moc_debuggertab.cpp" />\r
     <ClCompile Include="GeneratedFiles\Release\moc_DSPDasmWin.cpp">\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
index 33283c4..7c1fc12 100644 (file)
@@ -1,6 +1,7 @@
 Release 4 (TBD)\r
 ---------------\r
 0) The zoom value setting has been fixed in the registry\r
+1) Debugger mode shares the same alpine rom path setting\r
 \r
 Release 3 (13th November 2017)\r
 ------------------------------\r
index 032db33..c5b3a00 100644 (file)
@@ -59,6 +59,7 @@ void DebuggerTab::SetSettings(void)
        bool ok;\r
 \r
        //strcpy(vjs.debuggerROMPath, debuggerTab->edit1->text().toUtf8().data());\r
+       strcpy(vjs.debuggerROMPath, vjs.alpineROMPath);\r
        //strcpy(vjs.absROMPath, debuggerTab->edit2->text().toUtf8().data());\r
        vjs.nbrdisasmlines = edit3->text().toUInt(&ok, 10);\r
        //vjs.allowWritesToROM = debuggerTab->writeROM->isChecked();\r