Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
build
src/Executable/AttachXbe.h
external/CLI
external/nlohmann
.DS_Store
external/nlohmann
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ elseif(UNIX)
find_package(PkgConfig REQUIRED)
set(ENV{PKG_CONFIG_PATH} "/usr/local/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")

pkg_check_modules(LZ4 REQUIRED lz4)
pkg_check_modules(LZ4 REQUIRED liblz4)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could pose a problem

pkg_check_modules(ZSTD REQUIRED libzstd)
find_package(OpenSSL REQUIRED)
find_package(CURL REQUIRED)
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# XGDTool
This is a fork of wiredopposite/XGDTool to make compiling using gnumake easier on Linux.

<img src="https://github.com/wiredopposite/XGDTool/blob/master/resources/Screenshot.png" alt="App" width="700"/>

---

XGDTool is an OG Xbox and Xbox 360 disc utility, capable of converting discs to and from any mainstream format. It's available as a GUI or CLI app.

This program is still in initial testing. If you experience an issue, please report it in the Issues tab and help make this program better!
Expand Down
40 changes: 40 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
description = "C/C++ Development Environment with wxWidgets and OpenSSL";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
};

outputs =
{ self, nixpkgs }:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in
{
devShells.${system}.default = pkgs.mkShell {

# Tools needed to build the project
nativeBuildInputs = with pkgs; [
pkg-config
cmake
gnumake
];

# Libraries needed for linking
buildInputs = with pkgs; [
lz4
zstd
openssl
curl
wxwidgets_3_2
];

# Optional: A welcome message when you enter the shell
shellHook = ''
echo "C/C++ development shell active."
echo "Compiler toolchain, CMake, and wxWidgets are ready."
'';
};
};
}
4 changes: 3 additions & 1 deletion src/ImageWriter/CCIWriter/CCIWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

#include <lz4hc.h>

#include <algorithm>

#include "ImageWriter/CCIWriter/CCIWriter.h"
#include "AvlTree/AvlIterator.h"

Expand Down Expand Up @@ -481,4 +483,4 @@ std::vector<std::filesystem::path> CCIWriter::out_paths()
}

return { out_filepath_1_ };
}
}
4 changes: 3 additions & 1 deletion src/ImageWriter/CSOWriter/CSOWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include "AvlTree/AvlIterator.h"
#include "ImageWriter/CSOWriter/CSOWriter.h"

#include <algorithm>

CSOWriter::CSOWriter(std::shared_ptr<ImageReader> image_reader, const ScrubType scrub_type)
: image_reader_(image_reader),
scrub_type_(scrub_type)
Expand Down Expand Up @@ -535,4 +537,4 @@ std::vector<std::filesystem::path> CSOWriter::out_paths()
}

return { out_filepath_1_ };
}
}
3 changes: 2 additions & 1 deletion src/Utils/StringUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <string>
#include <vector>
#include <cstdint>

namespace StringUtils {
bool safe_string(const std::string &string);
Expand All @@ -14,4 +15,4 @@ namespace StringUtils {
std::string uint32_to_hex_string(uint32_t value);
};

#endif // _STRING_UTILS_H_
#endif // _STRING_UTILS_H_
2 changes: 2 additions & 0 deletions src/XGDLog.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef _XGDLOG_H_
#define _XGDLOG_H_

#include <cstdint>

#include <iostream>
#include <sstream>

Expand Down