Merge pull request #273 from ThKattanek/working_branch

Working branch

Author: ThKattanek

create_linux_appimage.sh

@@ -8,12 +8,51 @@
 # // Dieser Sourcecode ist Copyright geschützt!   //
 # // Geistiges Eigentum von Th.Kattanek           //
 # //                                              //
-# // Letzte Änderung am 13.03.2023                //
+# // Letzte Änderung am 15.03.2026                //
 # // www.emu64-projekt.de                         //
 # //                                              //
 # //////////////////////////////////////////////////
 
 #!/bin/bash
+set -euo pipefail
+
+usage() {
+  echo "Usage: $0 --qt <QT_ROOT>" >&2
+  echo "  Beispiel: $0 --qt \"$HOME/Qt/6.6.2/gcc_64\"" >&2
+  echo "  oder: QT_ROOT=\"$HOME/Qt/6.6.2/gcc_64\" $0" >&2
+}
+
+QT_ROOT="${QT_ROOT:-}"
+
+# --qt <path> aus Argumenten lesen (optional)
+if [[ ${1:-} == "--qt" ]]; then
+  QT_ROOT="${2:-}"
+  shift 2 || true
+elif [[ ${1:-} == "-h" || ${1:-} == "--help" ]]; then
+  usage
+  exit 0
+fi
+
+if [[ -z "$QT_ROOT" ]]; then
+  echo "WARNUNG: Kein QT_ROOT angegeben." >&2
+  usage
+  exit 1
+fi
+
+# Validierung
+if [[ ! -d "$QT_ROOT/bin" ]]; then
+  echo "WARNUNG: Ungültiger QT_ROOT (bin fehlt): $QT_ROOT" >&2
+  exit 1
+fi
+
+if [[ ! -x "$QT_ROOT/bin/qmake" && ! -x "$QT_ROOT/bin/qt-cmake" ]]; then
+  echo "WARNUNG: Kein qmake/qt-cmake in $QT_ROOT/bin gefunden: $QT_ROOT" >&2
+  exit 1
+fi
+
+# Qt nur für dieses Skript aktivieren
+export PATH="$QT_ROOT/bin:$PATH"
+export CMAKE_PREFIX_PATH="$QT_ROOT${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}"
 
 # Version
 ARCH=x86_64
@@ -29,6 +68,7 @@ fi
 cd appimage
 
 MYDIR="`cd $0; pwd`"
+echo "MYDIR is: " $MYDIR
 
 mkdir build
 
@@ -47,13 +87,13 @@ cp ../grafik/emu64.png ./AppDir
 
 # linuxdeploy 
 if [ ! -f ./linuxdeploy-x86_64.AppImage ]; then
-    wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+    wget "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
     chmod u+x ./linuxdeploy-x86_64.AppImage
 fi
 
 # linuxdeploy qt plugin
 if [ ! -f ./linuxdeploy-plugin-qt-x86_64.AppImage ]; then
-    wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+    wget "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
     chmod u+x ./linuxdeploy-plugin-qt-x86_64.AppImage
 fi
 

crossbuild-win-releases.sh

@@ -8,7 +8,7 @@
 # // Dieser Sourcecode ist Copyright geschützt!   //
 # // Geistiges Eigentum von Th.Kattanek           //
 # //                                              //
-# // Letzte Änderung am 24.06.2023                //
+# // Letzte Änderung am 15.03.2026                //
 # // www.emu64-projekt.de                         //
 # //                                              //
 # //////////////////////////////////////////////////
@@ -100,6 +100,12 @@ if [ $i686_ok ] && [ $x32 = true ]; then
     # compile ts files
     lrelease ../src/src.pro
 
+    # Alle PKG_CONFIG Pfade auf MXE umbiegen (hier für i686)
+    export PKG_CONFIG="$mxe_path/usr/bin/i686-w64-mingw32.static-pkg-config"
+    export PKG_CONFIG_LIBDIR="$mxe_path/usr/i686-w64-mingw32.static/lib/pkgconfig:$mxe_path/usr/i686-w64-mingw32.static/share/pkgconfig"
+    export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR"
+    export PKG_CONFIG_SYSROOT_DIR="$mxe_path/usr/i686-w64-mingw32.static"
+
     # execute qmake
     cd $build_i686_dir
     $i686_qmake PREFIX=$install_i686_dir QMAKE_LIBDIR=$i686_libpath ../.. 
@@ -157,6 +163,12 @@ if [ $x86_64_ok ] && [ $x64 = true ]; then
     # compile ts files
     lrelease ../src/src.pro
 
+    # Alle PKG_CONFIG Pfade auf MXE umbiegen (hier für i686)
+    export PKG_CONFIG="$mxe_path/usr/bin/x86_64-w64-mingw32.static-pkg-config"
+    export PKG_CONFIG_LIBDIR="$mxe_path/usr/x86_64-w64-mingw32.static/lib/pkgconfig:$mxe_path/usr/x86_64-w64-mingw32.static/share/pkgconfig"
+    export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR"
+    export PKG_CONFIG_SYSROOT_DIR="$mxe_path/usr/x86_64-w64-mingw32.static"
+
     # execute qmake
     cd $build_x86_64_dir
     $x86_64_qmake PREFIX=$install_x86_64_dir QMAKE_LIBDIR=$x86_64_libpath ../..

src/c64_class.cpp

@@ -75,6 +75,9 @@ C64Class::C64Class(int *ret_error, int soundbuffer_size, VideoCrtClass *video_cr
 
     this->start_minimized = start_minimized;
 
+    LimitCyclesEvent = nullptr;
+    DebugCartEvent = nullptr;
+
     changed_graphic_modi = false;
     changed_window_pos = false;
     changed_window_size = false;
@@ -95,6 +98,9 @@ C64Class::C64Class(int *ret_error, int soundbuffer_size, VideoCrtClass *video_cr
 
     warp_mode = false;
 
+    enable_debug_cart = false;
+    is_wtite_to_debug_cart = false;
+
     LogText = log_function;
 
     enable_mouse_1351 = false;
@@ -606,11 +612,26 @@ C64Class::~C64Class()
     if(crt != nullptr) delete crt;
     if(reu != nullptr) delete reu;
     if(geo != nullptr) delete geo;
+    if(tape != nullptr) delete tape;
 
     if(video_capture != nullptr) delete video_capture;
 
     if(audio_16bit_buffer != nullptr)
         delete [] audio_16bit_buffer;
+
+    SDL_FreeSurface(img_joy_arrow0);
+    SDL_FreeSurface(img_joy_arrow1);
+    SDL_FreeSurface(img_joy_button0);
+    SDL_FreeSurface(img_joy_button1);
+    SDL_FreeSurface(sdl_window_icon);
+
+    if(screenshot_dir != nullptr) delete[] screenshot_dir;
+
+    if(mutex1 != nullptr)
+    {
+        SDL_DestroyMutex(mutex1);
+        mutex1 = nullptr;
+    }
 }
 
 void C64Class::StartEmulation()
@@ -659,6 +680,8 @@ void C64Class::EndEmulation()
         time_out--;
     }
 
+    SDL_DetachThread(sdl_thread);
+
 	SDL_PauseAudioDevice(audio_dev, 1);
     if(audio_dev > 0) SDL_CloseAudioDevice(audio_dev);
 
@@ -673,7 +696,7 @@ void C64Class::SetLimitCycles(int nCycles)
 
 void C64Class::SetEnableDebugCart(bool enable)
 {
-    cpu->SetEnableDebugCart(enable);
+    enable_debug_cart = enable;
 }
 
 void AudioMix(void *not_used, Uint8 *stream, int laenge)
@@ -693,11 +716,14 @@ void AudioMix(void *not_used, Uint8 *stream, int laenge)
 int SDLThreadWarp(void *userdat)
 {
     C64Class *c64 = static_cast<C64Class*>(userdat);
+    c64->warp_thread_is_end = false;
 
     while(!c64->warp_thread_end)
     {
-        c64->WarpModeLoop();
+       c64->WarpModeLoop();
     }
+
+    c64->warp_thread_is_end = true;
     return 0;
 }
 
@@ -924,17 +950,17 @@ void C64Class::WarpModeLoop()
         }
     }
 
-    if(cpu->WRITE_DEBUG_CART)
+    // DebugCartEvent soll nur maximal einmal aufgerufen werden
+    if(is_wtite_to_debug_cart && (DebugCartEvent != nullptr))
     {
-        // Event auslösen
-        cpu->WRITE_DEBUG_CART = false;
-        if(DebugCartEvent != nullptr) DebugCartEvent(cpu->GetDebugCartValue());
+        is_wtite_to_debug_cart = false;
+        DebugCartEvent(debug_cart_value);
+        DebugCartEvent = nullptr; // Nur einmal aufrufen
     }
 
     NextSystemCycle();
 
     ////////////////////////// Testweise //////////////////////////
-
     static int zyklen_counter = 0;
     if(++zyklen_counter == 19656)
     {
@@ -1039,11 +1065,13 @@ void C64Class::FillAudioBuffer(uint8_t *stream, int laenge)
                 }
             }
 
-            if(cpu->WRITE_DEBUG_CART)
+
+            // DebugCartEvent soll nur maximal einmal aufgerufen werden
+            if(is_wtite_to_debug_cart && (DebugCartEvent != nullptr))
             {
-                // Event auslösen
-                cpu->WRITE_DEBUG_CART = false;
-                if(DebugCartEvent != nullptr) DebugCartEvent(cpu->GetDebugCartValue());
+                is_wtite_to_debug_cart = false;
+                DebugCartEvent(debug_cart_value);
+                DebugCartEvent = nullptr; // Nur einmal aufrufen
             }
 
             NextSystemCycle();
@@ -2710,12 +2738,21 @@ void C64Class::EnableWarpMode(bool enabled)
         SDL_PauseAudioDevice(audio_dev, 1);     // Audiostream pausieren
         warp_thread_end = false;
         warp_thread = SDL_CreateThread(SDLThreadWarp,"WarpThread",this);
+        LogText("WarpMode aktiviert\n");
     }
     else
     {
         // WarpMode deaktivieren
 		warp_thread_end = true;
+        SDL_DetachThread(warp_thread);
+
+        while(!warp_thread_is_end)
+        {
+            SDL_Delay(1);
+        }
+
         SDL_PauseAudioDevice(audio_dev, 0);     // Audiostream wieder starten
+        LogText("WarpMode deaktiviert\n");
 	}
 }
 
@@ -4003,7 +4040,7 @@ void C64Class::NextSystemCycle()
 {
     CheckKeys();
 
-	if(hold_next_system_cycle)
+    if(hold_next_system_cycle)
 		return;
 
     cycle_counter++;
@@ -4276,6 +4313,12 @@ bool C64Class::CheckBreakpoints()
 
 void C64Class::WriteSidIO(uint16_t address, uint8_t value)
 {
+    if((enable_debug_cart == true) && (address == DEBUG_CART_ADRESS))
+    {
+        debug_cart_value = value;
+        is_wtite_to_debug_cart = true;
+    }
+
     if(enable_stereo_sid)
     {
         if((address & 0xFFE0) == 0xD400) sid1->WriteIO(address,value);

src/c64_class.h

@@ -55,6 +55,8 @@
 
 #define MAX_VIDEO_DISPLAYS 8				  // Anzahl der Maximal unterstützen Video Displays
 
+#define DEBUG_CART_ADRESS 0xD7FF
+
 enum SCREENSHOT_FORMATS {SCREENSHOT_FORMAT_BMP, SCREENSHOT_FORMAT_PNG, SCREENSHOT_FORMATS_COUNT};
 
 class C64Class
@@ -331,6 +333,7 @@ class C64Class
 
     SDL_Thread      *warp_thread;
     bool            warp_thread_end;
+    bool            warp_thread_is_end;
 
     uint8_t         *vic_buffer;
     VideoCrtClass   *video_crt_output;
@@ -520,8 +523,12 @@ class C64Class
     bool        c64_command_line_count_s;
 
     uint32_t    cycle_counter;
-	int         limit_cycles_counter;        // Dieser Counter wird wenn er > 0 ist bei jeden Zyklus um 1 runtergezählt
-	bool		hold_next_system_cycle;		 // Wird dieses Flag gesetzt wird verhindert das ein C64 Cylce ausgeführt wird
+    int         limit_cycles_counter;           // Dieser Counter wird wenn er > 0 ist bei jeden Zyklus um 1 runtergezählt
+    bool		hold_next_system_cycle;         // Wird dieses Flag gesetzt wird verhindert das ein C64 Cylce ausgeführt wird
+
+    bool        enable_debug_cart;          // Wird auf true gesetzt wenn der Debug Cart aktiviert ist
+    bool        is_wtite_to_debug_cart;     // Wird auf true gesetzt wenn in den Debug Cart geschrieben wird
+    unsigned char   debug_cart_value;           // Wert der im Debug Cart steht
 
 	bool        debug_mode;
     bool        debug_animation;

src/cartridge_class.cpp

@@ -45,6 +45,17 @@ CartridgeClass::CartridgeClass()
 
 CartridgeClass::~CartridgeClass()
 {
+    if(am29f040Lo != nullptr)
+    {
+        delete am29f040Lo;
+        am29f040Lo = nullptr;
+    }
+
+    if(am29f040Hi != nullptr)
+    {
+        delete am29f040Hi;
+        am29f040Hi = nullptr;
+    }
 }
 
 void CartridgeClass::ResetAllLEDS(void)

src/cartridge_window.cpp

@@ -145,6 +145,9 @@ CartridgeWindow::~CartridgeWindow()
     ////////////////////////////////////
 
     delete ui;
+
+    if(LedRedOff != nullptr) delete LedRedOff;
+    if(LedRedOn != nullptr) delete LedRedOn;
 }
 
 void CartridgeWindow::LoadIni(void)

src/command_line_class.cpp

@@ -272,6 +272,7 @@ bool CommandLineClass::CheckLongCommands(const char *long_command)
             char *str = new char[255];
             sprintf(str,"--%s", long_command);
             AddCommand(all_commands_list[i].cmd_command, str);
+            delete[] str;
             found = true;
         }
     }

src/d64_class.cpp

@@ -116,11 +116,12 @@ bool D64Class::ExportPrg(int file_number, const char *filename)
     uint8_t current_track = d64_files[file_number].Track;
     uint8_t current_sector = d64_files[file_number].Sektor;
 
-    while(current_track != 0)
+    while(current_track != 0 && block_count > 0)
     {
         ReadBlock(current_track, current_sector, block);
         current_track = block[0];
         current_sector = block[1];
+        block_count--;
         if(current_track == 0) fwrite(block+2, 1, current_sector - 1, file);
         else fwrite(block+2, 1, 254, file);
     }

src/d64_class.h

@@ -8,7 +8,6 @@
 // Dieser Sourcecode ist Copyright geschützt!   //
 // Geistiges Eigentum von Th.Kattanek           //
 //                                              //
-// Letzte Änderung am 26.06.2021         		//
 // www.emu64.de                                 //
 //                                              //
 //////////////////////////////////////////////////
@@ -17,8 +16,7 @@
 #define D64_CLASS_H
 
 #include <cstring>
-#include <fstream>
-#include <iostream>
+#include <cstdio>
 
 #define D64_IMAGE_SIZE 174848
 

src/debugger_iec_window.cpp

@@ -40,6 +40,9 @@ DebuggerIECWindow::DebuggerIECWindow(QWidget *parent) :
 DebuggerIECWindow::~DebuggerIECWindow()
 {
     delete ui;
+
+    if(icon_off != nullptr) delete icon_off;
+    if(icon_on != nullptr) delete icon_on;
 }
 
 void DebuggerIECWindow::RetranslateUi()