Skip to content

Commit cfa09e8

Browse files
committed
v1.09h, add architecture to Linux builds
1 parent a09d2c3 commit cfa09e8

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

UwxMainWindow.cpp

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,23 @@
4545
QString gstrMacBundlePath;
4646
#endif
4747
#else
48-
//Assume linux
49-
#define OS "Linux"
48+
//Assume Linux
49+
#ifdef __aarch64__
50+
//ARM64
51+
#define OS "Linux (AArch64)"
52+
#elif __arm__
53+
//ARM
54+
#define OS "Linux (ARM)"
55+
#elif __x86_64__
56+
//x86_64
57+
#define OS "Linux (x86_64)"
58+
#elif __i386
59+
//x86
60+
#define OS "Linux (x86)"
61+
#else
62+
//Unknown
63+
#define OS "Linux (other)"
64+
#endif
5065
#endif
5166

5267
/******************************************************************************/
@@ -1470,9 +1485,7 @@ MainWindow::SerialRead(
14701485
//Run Pre-XComp program
14711486
RunPrePostExecutable(gstrTermFilename);
14721487
}
1473-
//Windows
14741488
gprocCompileProcess.start(QString(gpTermSettings->value("CompilerDir", DefaultCompilerDir).toString()).append((gpTermSettings->value("CompilerSubDirs", DefaultCompilerSubDirs).toBool() == true ? QString(strDevName).append("/") : "")).append("XComp_").append(strDevName).append("_").append(remTempREM.captured(2)).append("_").append(remTempREM.captured(3)).append(".exe"), QStringList(gstrTermFilename));
1475-
//gprocCompileProcess.waitForFinished(-1);
14761489
}
14771490
else if (QFile::exists(QString(lstFI[0]).append("XComp_").append(strDevName).append("_").append(remTempREM.captured(2)).append("_").append(remTempREM.captured(3)).append(".exe")) == true)
14781491
{

UwxMainWindow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
#define MODE_CHECK_FIRMWARE_VERSIONS 17
9999
#define MODE_CHECK_FIRMWARE_SUPPORT 18
100100
//Defines for version and functions
101-
#define UwVersion "1.08g" //Version string
101+
#define UwVersion "1.08h" //Version string
102102
//
103103
#define FileReadBlock 512 //Number of bytes to read per block when streaming files
104104
#define StreamProgress 10000 //Number of bytes between streaming progress updates

version.aps

-57.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)