Compare commits
	
		
			10 Commits
		
	
	
		
			1d7deb164a
			...
			ba4cf5de71
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						ba4cf5de71
	
				 | 
					
					
						|||
| 
						
						
							
						
						fe8d598e6c
	
				 | 
					
					
						|||
| 
						
						
							
						
						70b23d6e3c
	
				 | 
					
					
						|||
| 
						
						
							
						
						cfb5330541
	
				 | 
					
					
						|||
| 
						
						
							
						
						7a38c9897d
	
				 | 
					
					
						|||
| 
						
						
							
						
						de97769de4
	
				 | 
					
					
						|||
| 
						
						
							
						
						6b34feba9f
	
				 | 
					
					
						|||
| 
						
						
							
						
						c0ff920294
	
				 | 
					
					
						|||
| 
						
						
							
						
						0a5cfade7f
	
				 | 
					
					
						|||
| 
						
						
							
						
						2104adb478
	
				 | 
					
					
						
							
								
								
									
										16
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,16 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					#name: C/C++ CI
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#on:
 | 
				
			||||||
 | 
					#  push:
 | 
				
			||||||
 | 
					#    branches: [ "master" ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#jobs:
 | 
				
			||||||
 | 
					#  build:
 | 
				
			||||||
 | 
					#    runs-on: ubuntu-latest
 | 
				
			||||||
 | 
					#    steps:
 | 
				
			||||||
 | 
					#      - uses: actions/checkout@v4
 | 
				
			||||||
 | 
					#      - name: deps
 | 
				
			||||||
 | 
					#        run: sudo apt install qt6-base-dev qt6-base-private-dev qt6-svg-dev build-essential cmake libxi-dev libxrandr-dev
 | 
				
			||||||
 | 
					#      - name: make
 | 
				
			||||||
 | 
					#        run: make -j$(nproc)
 | 
				
			||||||
							
								
								
									
										3
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								Makefile
									
									
									
									
									
								
							@@ -1,14 +1,13 @@
 | 
				
			|||||||
all: src/main.cpp src/options.cpp submodules preinstall
 | 
					all: src/main.cpp src/options.cpp submodules preinstall
 | 
				
			||||||
	cc -Wall -O -std=c++20 src/main.cpp src/options.cpp -o bin/rvz-convert -lstdc++
 | 
						cc -Wall -O -std=c++20 src/main.cpp src/options.cpp -o bin/rvz-convert -lstdc++
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
submodules:
 | 
					submodules:
 | 
				
			||||||
	git submodule update --init --recursive --depth=1
 | 
						git submodule update --init --recursive --depth=1
 | 
				
			||||||
	cmake -S lib/dolphin -B lib/dolphin/cmake-build
 | 
						cmake -S lib/dolphin -B lib/dolphin/cmake-build
 | 
				
			||||||
	make -C lib/dolphin/cmake-build dolphin-tool
 | 
						make -C lib/dolphin/cmake-build dolphin-tool
 | 
				
			||||||
	make -C lib/wiimms-iso-tools/project
 | 
						make -C lib/wiimms-iso-tools/project
 | 
				
			||||||
 | 
					
 | 
				
			||||||
preinstall:
 | 
					preinstall: submodules
 | 
				
			||||||
	cp lib/wiimms-iso-tools/project/bin/wit bin/
 | 
						cp lib/wiimms-iso-tools/project/bin/wit bin/
 | 
				
			||||||
	cp lib/dolphin/cmake-build/Binaries/dolphin-tool bin/
 | 
						cp lib/dolphin/cmake-build/Binaries/dolphin-tool bin/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,9 +20,13 @@ Please use after installing to PATH (`sudo make install`)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
### Dependencies:
 | 
					### Dependencies:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Note: Most of these are dolphin dependencies. Still working on cutting out the Qt6 dependencies as it's a total PITA to compile the entirety of dolphin.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Qt6 Base
 | 
					- Qt6 Base
 | 
				
			||||||
- Qt6 SVG
 | 
					- Qt6 SVG
 | 
				
			||||||
- Qt6 qtbase private libraries
 | 
					- Qt6 qtbase private libraries
 | 
				
			||||||
- Working compiler toolchain (build-essential)
 | 
					- Working compiler toolchain (build-essential)
 | 
				
			||||||
- GNU Make
 | 
					- GNU Make
 | 
				
			||||||
- CMake
 | 
					- CMake
 | 
				
			||||||
 | 
					- Xi
 | 
				
			||||||
 | 
					- LibXRandr
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
#include <getopt.h>
 | 
					#include <getopt.h>
 | 
				
			||||||
#include <iostream>
 | 
					#include <iostream>
 | 
				
			||||||
#define VERSION "v1.0.0-rc1"
 | 
					#define VERSION "v1.0.0-rc2"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void version() {
 | 
					void version() {
 | 
				
			||||||
    std::cout << "rvz-convert " << VERSION << std::endl;
 | 
					    std::cout << "rvz-convert " << VERSION << std::endl;
 | 
				
			||||||
@@ -11,7 +11,7 @@ void version() {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void help() {
 | 
					void help() {
 | 
				
			||||||
    std::cout << "Usage: rvz-convert [options] file.iso" << std::endl;
 | 
					    std::cout << "Usage: rvz-convert [options] file.rvz" << std::endl;
 | 
				
			||||||
    std::cout << "Options:\n\t-h --help\tDisplay this message" << std::endl;
 | 
					    std::cout << "Options:\n\t-h --help\tDisplay this message" << std::endl;
 | 
				
			||||||
    std::cout << "\t-v --version\tDisplay version information" << std::endl;
 | 
					    std::cout << "\t-v --version\tDisplay version information" << std::endl;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user