diff --git a/.gitignore b/.gitignore index 415ef1d..3f738e9 100644 --- a/.gitignore +++ b/.gitignore @@ -399,4 +399,5 @@ FodyWeavers.xsd .idea # Build -build/ \ No newline at end of file +build/ +/hollow-launcher/target diff --git a/build.ps1 b/build.ps1 index 94dbdcb..d09eed9 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,5 +1,5 @@ param( - [string] $Version = "0.0.1.0" + [string] $Version = "0.0.2.0" ) $ErrorActionPreference = "Stop"; @@ -10,13 +10,13 @@ cargo build --manifest-path .\hollow-launcher\Cargo.toml -r Write-Output "Start building withRuntime..."; -dotnet publish Hollow/Hollow.csproj -o "build/$Version/withRuntime/hollow_app" -r win-x64 -p:SelfContained=true -p:AssemblyVersion=$Version -p:Configuration=Release; +dotnet publish Hollow.Windows/Hollow.Windows.csproj -o "build/$Version/withRuntime/hollow_app" -r win-x64 -p:SelfContained=true -p:AssemblyVersion=$Version -p:Configuration=Release; Copy-Item -Path ".\hollow-launcher\target\release\Hollow.exe" -Destination ".\build\$Version\withRuntime\Hollow.exe" Write-Output "Start building withoutRuntime..."; -dotnet publish Hollow/Hollow.csproj -o "build/$Version/withoutRuntime/hollow_app" -r win-x64 -p:SelfContained=false -p:AssemblyVersion=$Version -p:Configuration=Release; +dotnet publish Hollow.Windows/Hollow.Windows.csproj -o "build/$Version/withoutRuntime/hollow_app" -r win-x64 -p:SelfContained=false -p:AssemblyVersion=$Version -p:Configuration=Release; Copy-Item -Path ".\hollow-launcher\target\release\Hollow.exe" -Destination ".\build\$Version\withoutRuntime\Hollow.exe" diff --git a/hollow-launcher/src/main.rs b/hollow-launcher/src/main.rs index 5d88439..b3a5ef4 100644 --- a/hollow-launcher/src/main.rs +++ b/hollow-launcher/src/main.rs @@ -46,7 +46,7 @@ fn main() -> Result<(), Box> { panic_then_pause(format!("{:?} is not a directory", root_directory)); } - let executable = root_directory.join("Hollow.exe"); + let executable = root_directory.join("Hollow.Windows.exe"); if !executable.exists() { panic_then_pause(format!("{:?} not found", executable)); } diff --git a/hollow-launcher/target/.rustc_info.json b/hollow-launcher/target/.rustc_info.json deleted file mode 100644 index 7148a7e..0000000 --- a/hollow-launcher/target/.rustc_info.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc_fingerprint":5144606500605799413,"outputs":{"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.81.0-nightly (fcaa6fdfb 2024-07-13)\nbinary: rustc\ncommit-hash: fcaa6fdfbee1316184e7ad98c53241d52cd30a5f\ncommit-date: 2024-07-13\nhost: x86_64-pc-windows-msvc\nrelease: 1.81.0-nightly\nLLVM version: 18.1.7\n","stderr":""},"14305839045545480886":{"success":true,"status":"","code":0,"stdout":"___.exe\nlib___.rlib\n___.dll\n___.dll\n___.lib\n___.dll\n","stderr":""},"12744816824612481171":{"success":true,"status":"","code":0,"stdout":"___.exe\nlib___.rlib\n___.dll\n___.dll\n___.lib\n___.dll\nC:\\Users\\mccree\\.rustup\\toolchains\\nightly-x86_64-pc-windows-msvc\npacked\n___\ndebug_assertions\noverflow_checks\npanic=\"unwind\"\nproc_macro\nrelocation_model=\"pic\"\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"msvc\"\ntarget_family=\"windows\"\ntarget_feature=\"cmpxchg16b\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"lahfsahf\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_feature=\"sse3\"\ntarget_has_atomic\ntarget_has_atomic=\"128\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_equal_alignment=\"128\"\ntarget_has_atomic_equal_alignment=\"16\"\ntarget_has_atomic_equal_alignment=\"32\"\ntarget_has_atomic_equal_alignment=\"64\"\ntarget_has_atomic_equal_alignment=\"8\"\ntarget_has_atomic_equal_alignment=\"ptr\"\ntarget_has_atomic_load_store\ntarget_has_atomic_load_store=\"128\"\ntarget_has_atomic_load_store=\"16\"\ntarget_has_atomic_load_store=\"32\"\ntarget_has_atomic_load_store=\"64\"\ntarget_has_atomic_load_store=\"8\"\ntarget_has_atomic_load_store=\"ptr\"\ntarget_os=\"windows\"\ntarget_pointer_width=\"64\"\ntarget_thread_local\ntarget_vendor=\"pc\"\nub_checks\nwindows\n","stderr":""}},"successes":{}} \ No newline at end of file diff --git a/hollow-launcher/target/CACHEDIR.TAG b/hollow-launcher/target/CACHEDIR.TAG deleted file mode 100644 index 20d7c31..0000000 --- a/hollow-launcher/target/CACHEDIR.TAG +++ /dev/null @@ -1,3 +0,0 @@ -Signature: 8a477f597d28d172789f06886806bc55 -# This file is a cache directory tag created by cargo. -# For information about cache directory tags see https://bford.info/cachedir/