diff --git a/.gitignore b/.gitignore index 8b1aab2..fbd5b34 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea -cmake-build-debug \ No newline at end of file +cmake-build-debug +bin/* \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d213dea --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "lib/dolphin"] + path = lib/dolphin + url = https://github.com/dolphin-emu/dolphin.git +[submodule "lib/wiimms-iso-tools"] + path = lib/wiimms-iso-tools + url = https://github.com/Wiimm/wiimms-iso-tools.git diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index d355abc..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -cmake_minimum_required(VERSION 3.13) -project(rvz-convert) -add_library(Options STATIC src/options.cpp) -target_include_directories(Options PUBLIC ${CMAKE_SOURCE_DIR}/src) -add_executable(Main src/main.cpp) -find_program(MAKE NAMES make) - -include(ExternalProject) - -externalproject_add(Dolphin - GIT_REPOSITORY https://github.com/dolphin-emu/dolphin.git - GIT_SUBMODULES - GIT_TAG 2412 - PREFIX dolphin - BUILD_COMMAND ${CMAKE_COMMAND} --build . --target dolphin-tool -j8 - UPDATE_COMMAND "" - INSTALL_COMMAND "" -) - -externalproject_add(WIT - GIT_REPOSITORY https://github.com/Wiimm/wiimms-iso-tools.git - GIT_SUBMODULES - CONFIGURE_COMMAND "" - BUILD_IN_SOURCE TRUE - BUILD_COMMAND ${MAKE} -C project - PREFIX wit - UPDATE_COMMAND "" - INSTALL_COMMAND "" -) - -target_link_libraries(Main Options) \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d14140b --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +all: src/main.cpp src/options.cpp submodules + cc -Wall -O src/main.cpp src/options.cpp -o bin/rvz-convert -lstdc++ + +submodules: diff --git a/lib/dolphin b/lib/dolphin new file mode 160000 index 0000000..510a688 --- /dev/null +++ b/lib/dolphin @@ -0,0 +1 @@ +Subproject commit 510a688a2ae7fd127b8fb29808d8c65af9fa9214 diff --git a/lib/wiimms-iso-tools b/lib/wiimms-iso-tools new file mode 160000 index 0000000..fc1c0b8 --- /dev/null +++ b/lib/wiimms-iso-tools @@ -0,0 +1 @@ +Subproject commit fc1c0b840cb3ac41ca6e4f1d5e16da12b47eab58