second attempt

CMakeLists.txt-qt4

@@ -129,7 +129,6 @@ add_definitions (-DTHREADED_DECODING)	# uncomment for use for an RPI
                    ./includes/backend/data/mot
                    ./includes/backend/data/journaline
                    ./includes/support
-                   ./includes/support/viterbi_768
                    ./includes/output
                    ./devices
 	           /usr/include/
@@ -175,10 +174,9 @@ add_definitions (-DTHREADED_DECODING)	# uncomment for use for an RPI
              ./includes/output/audio-base.h
              ./includes/output/newconverter.h
 	     ./includes/output/audiosink.h
-             ./includes/support/viterbi_768/viterbi-768.h
+             ./includes/support/viterbi-handler.h
              ./includes/support/fft-handler.h
              ./includes/support/ringbuffer.h
-             ./includes/support/Xtan2.h
              ./includes/support/dab-params.h
              ./includes/support/band-handler.h
              ./includes/support/text-mapper.h
@@ -228,13 +226,11 @@ add_definitions (-DTHREADED_DECODING)	# uncomment for use for an RPI
              ./src/output/fir-filters.cpp
 	     ./src/output/audiosink.cpp
              ./src/support/fft-handler.cpp
-             ./src/support/Xtan2.cpp
              ./src/support/dab-params.cpp
              ./src/support/band-handler.cpp
              ./src/support/text-mapper.cpp
              ./src/support/dab_tables.cpp
-             ./src/support/viterbi_768/viterbi-768.cpp
-             ./src/support/viterbi_768/spiral-no-sse.c
+             ./src/support/viterbi-handler.cpp
 	)
 
 	set (${objectName}_MOCS

CMakeLists.txt-qt5

@@ -133,7 +133,6 @@ endif ()
 	           ./includes/backend/data/journaline
 	           ./includes/backend/data/mot
 	           ./includes/support
-	           ./includes/support/viterbi_768
 	           ./includes/output
 	           ./devices
 	           /usr/include/
@@ -178,10 +177,9 @@ endif ()
 	     ./includes/output/fir-filters.h
 	     ./includes/output/audio-base.h
 	     ./includes/output/newconverter.h
-	     ./includes/support/viterbi_768/viterbi-768.h
+	     ./includes/support/viterbi-handler.h
 	     ./includes/support/fft-handler.h
 	     ./includes/support/ringbuffer.h
-	     ./includes/support/Xtan2.h
 	     ./includes/support/dab-params.h
 	     ./includes/support/band-handler.h
 	     ./includes/support/text-mapper.h
@@ -230,13 +228,11 @@ endif ()
 	     ./src/output/newconverter.cpp
 	     ./src/output/fir-filters.cpp
 	     ./src/support/fft-handler.cpp
-	     ./src/support/Xtan2.cpp
 	     ./src/support/dab-params.cpp
 	     ./src/support/band-handler.cpp
 	     ./src/support/text-mapper.cpp
 	     ./src/support/dab_tables.cpp
-	     ./src/support/viterbi_768/viterbi-768.cpp
-	     ./src/support/viterbi_768/spiral-no-sse.c
+	     ./src/support/viterbi-handler.cpp
 	)
 
 	set (${objectName}_UIS

dabradio-installer

@@ -0,0 +1,69 @@
+
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "dabradio"
+#define MyAppVersion "1.0"
+#define MyAppPublisher "Lazy Chair Computing"
+#define MyAppURL "https://github.com/JvanKatwijk/dabradio"
+#define MyAppExeName "dabradio-1.0.exe";
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId= {{0BD3638B-D634-4F75-B8BF-756A9FB7A370}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DisableProgramGroupPage=yes
+LicenseFile=E:\sdr-j-development\windows-qt-dab\COPYRIGHT.this_software
+InfoBeforeFile=E:\sdr-j-development\windows-qt-dab\preamble.txt
+OutputBaseFilename=setup-dabradio
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "E:\sdr-j-development\windows-dabradio\dabradio-1.0.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "E:\sdr-j-development\windows-dabradio\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "E:\sdr-j-development\SDRplay_RSP_API-Windows-2.13.1.exe"; DestDir: "{app}"; AfterInstall : install_sdrplayApi
+
+[Icons]
+Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[code]
+procedure install_sdrplayApi;
+var
+    resultCode : Integer;
+    Names      : TArrayOfString;
+    I          : Integer;
+    found      : Boolean;
+
+ begin
+    
+    RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'SOFTWARE\MiricsSDR', Names);
+    for I := 0 to GetArrayLength(Names)-1 do
+       if Names [I] = 'API' then found := true;
+
+    if not found 
+    then
+       begin
+          MsgBox ('Software\MiricsSDR\API not found', mbInformation, MB_OK);
+          Exec (ExpandConstant('{app}\SDRplay_RSP_API-Windows-2.13.1.exe'), '', '', SW_SHOWNORMAL,
+          ewWaitUntilTerminated, ResultCode);
+       end
+end;