From f6f8a5571cce8350d0be3abaf2be0322228557b2 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 12 Jun 2017 17:39:52 -0500 Subject: [PATCH] fix build batch files to point to output folder instead of output64 --- Dist/BuildAndPackage.bat | 10 +++++----- Dist/MakeDiscohawk.bat | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dist/BuildAndPackage.bat b/Dist/BuildAndPackage.bat index bdeca942d6..b7ec9e82af 100644 --- a/Dist/BuildAndPackage.bat +++ b/Dist/BuildAndPackage.bat @@ -23,7 +23,7 @@ call "%MSBUILDDIR%msbuild.exe" ..\BizHawk.sln /p:Configuration=Release /p:Platfo rmdir /s /q temp del /s %NAME% -cd ..\output64 +cd ..\output rem slimdx has a way of not making it into the output directory, so this is a good time to make sure copy ..\..\SlimDx.dll @@ -46,12 +46,12 @@ rmdir /s /q temp\lua rmdir /s /q temp\firmware rmdir /s /q gitsucks -git --git-dir ../.git archive --format zip --output64 lua.zip HEAD Assets/Lua -git --git-dir ../.git archive --format zip --output64 firmware.zip HEAD output64/Firmware +git --git-dir ../.git archive --format zip --output lua.zip HEAD Assets/Lua +git --git-dir ../.git archive --format zip --output firmware.zip HEAD output/Firmware rem Getting externaltools example from my repo rem I once talked about a dedicated repo for external tools, think about moving the exemple to it it it happend git clone https://github.com/Hathor86/HelloWorld_BizHawkTool.git -git --git-dir HelloWorld_BizHawkTool/.git archive --format zip --output64 HelloWorld_BizHawkTool.zip master +git --git-dir HelloWorld_BizHawkTool/.git archive --format zip --output HelloWorld_BizHawkTool.zip master rmdir /s /q HelloWorld_BizHawkTool unzip lua.zip -d gitsucks @@ -59,7 +59,7 @@ rem del lua.zip move gitsucks\Assets\Lua temp unzip Firmware.zip -d gitsucks rem del firmware.zip -move gitsucks\output64\Firmware temp +move gitsucks\output\Firmware temp rmdir /s /q gitsucks diff --git a/Dist/MakeDiscohawk.bat b/Dist/MakeDiscohawk.bat index 95643bbce2..a4ccf61c66 100644 --- a/Dist/MakeDiscohawk.bat +++ b/Dist/MakeDiscohawk.bat @@ -1,6 +1,6 @@ pushd %~dp0\ del /s DiscoHawk.zip -set DIR=..\output64 +set DIR=..\output set BUILDDIR=%~dp0 echo %BUILDIR% cd "%DIR%"