From a8304813c9766b3c93c58d13bd4f89f1aa95564b Mon Sep 17 00:00:00 2001 From: Scooter <62129754+vaparetia@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:24:31 -0600 Subject: [PATCH 1/4] Update CMakeLists.txt Added 32bit compile options for building 32bit binaries by default on Linux --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7aec9fa..f4becb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,4 +9,6 @@ set(SOURCE_FILES add_executable(extract-xiso ${SOURCE_FILES}) target_compile_definitions(extract-xiso PRIVATE ${TARGET_OS}) +target_compile_options(extract-xiso PUBLIC -m32) +target_link_options(extract-xiso PUBLIC -m32) install(TARGETS extract-xiso RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") From 93035c4141287503eaca2b5d659cf9d63cbdf95e Mon Sep 17 00:00:00 2001 From: Scooter <62129754+vaparetia@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:17:42 -0600 Subject: [PATCH 2/4] Update README.md Added instructions for Fedora and Ubuntu dependencies. On Fedora, cmake will error unless it has "gcc-c++" installed to check against. It's just easier for users to have it installed instead of making seperate build instructions for Fedora. --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 0b7e18e..5a16c60 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,17 @@ Extract XISO contents to a directory. - make - gcc +### Linux Requirements + + #### Fedora + ``` +sudo dnf install cmake gcc gcc-c++ glibc-devel.i686 -y +``` + #### Ubuntu + ``` +sudo apt install gcc-multilib build-essential -y +``` + ### Windows / macOS / Linux After requirements are installed with your distribution's package manager (or homebrew for macOS), open terminal and change directory to the project root. Then run the following build commands: From 82b36c43a5db741201be30a42d439dcd13a7a93e Mon Sep 17 00:00:00 2001 From: Scooter <62129754+vaparetia@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:20:06 -0600 Subject: [PATCH 3/4] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5a16c60..e5eb4b6 100644 --- a/README.md +++ b/README.md @@ -84,15 +84,15 @@ Extract XISO contents to a directory. - make - gcc -### Linux Requirements +### Linux Distribution Requirements #### Fedora ``` -sudo dnf install cmake gcc gcc-c++ glibc-devel.i686 -y +sudo dnf install cmake gcc gcc-c++ glibc-devel.i686 git -y ``` #### Ubuntu ``` -sudo apt install gcc-multilib build-essential -y +sudo apt install gcc-multilib build-essential git -y ``` ### Windows / macOS / Linux From d2c4970185760df684229c2f5688427cbe58c213 Mon Sep 17 00:00:00 2001 From: Scooter <62129754+vaparetia@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:26:18 -0600 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e5eb4b6..35430ce 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Extract XISO contents to a directory. #### Fedora ``` -sudo dnf install cmake gcc gcc-c++ glibc-devel.i686 git -y +sudo dnf install cmake gcc gcc-c++ glibc-devel.i686 git -y ``` #### Ubuntu ```