diff --git a/Linux/bin/fasm b/Linux/bin/fasm new file mode 100755 index 00000000..5655ceb1 Binary files /dev/null and b/Linux/bin/fasm differ diff --git a/Linux/bin/listing b/Linux/bin/listing new file mode 100755 index 00000000..43fee429 Binary files /dev/null and b/Linux/bin/listing differ diff --git a/Linux/share/sasm/FASM/fasm b/Linux/share/sasm/FASM/fasm deleted file mode 100755 index b176fde4..00000000 Binary files a/Linux/share/sasm/FASM/fasm and /dev/null differ diff --git a/Linux/share/sasm/FASM/listing b/Linux/share/sasm/FASM/listing deleted file mode 100755 index db88b7db..00000000 Binary files a/Linux/share/sasm/FASM/listing and /dev/null differ diff --git a/SASM.pro b/SASM.pro index 749d3c38..5b2415a4 100644 --- a/SASM.pro +++ b/SASM.pro @@ -19,6 +19,7 @@ BINDIR = $$PREFIX/bin DATADIR = $$PREFIX/share binfile.files += sasm +binfile.files += Linux/bin/* binfile.path = $$BINDIR data.files += Linux/share/sasm/* data.path = $$DATADIR/sasm/ diff --git a/fasm.cpp b/fasm.cpp index ae9c26d4..0be3c1a3 100644 --- a/fasm.cpp +++ b/fasm.cpp @@ -50,7 +50,7 @@ QString FASM::getAssemblerPath() #ifdef Q_OS_WIN32 return Common::applicationDataPath() + "/FASM/fasm.exe"; #else - return Common::applicationDataPath() + "/FASM/fasm"; + return "fasm"; #endif } @@ -77,7 +77,7 @@ QString FASM::getListingFilePath(QFile &lstOut) #ifdef Q_OS_WIN32 getLst.start(Common::applicationDataPath() + "/FASM/listing.exe", getLstArguments); #else - getLst.start(Common::applicationDataPath() + "/FASM/listing", getLstArguments); + getLst.start("listing", getLstArguments); #endif getLst.waitForFinished(); return listingPath;