ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

convert build scripts to 64bit

This commit is contained in:
adelikat 2017-06-10 10:36:26 -05:00
parent d8c19f3787
commit 767ae4d8b9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dist/BuildAndPackage.bat
View File

@ -17,13 +17,13 @@ for /f "skip=2 tokens=2,*" %%A in ('reg.exe query "HKLM\SOFTWARE\Microsoft\MSBui
IF NOT EXIST %MSBUILDDIR%nul goto MISSINGMSBUILD
IF NOT EXIST %MSBUILDDIR%msbuild.exe goto MISSINGMSBUILD
call "%MSBUILDDIR%msbuild.exe" ..\BizHawk.sln /p:Configuration=Release /p:Platform="x86" /t:rebuild
call "%MSBUILDDIR%msbuild.exe" ..\BizHawk.sln /p:Configuration=Release /p:Platform="x64" /t:rebuild
@if errorlevel 1 goto MSBUILDFAILED
rmdir /s /q temp
del /s %NAME%
cd ..\output
cd ..\output64
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 --output lua.zip HEAD Assets/Lua
git --git-dir ../.git archive --format zip --output firmware.zip HEAD output/Firmware
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
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 --output HelloWorld_BizHawkTool.zip master
git --git-dir HelloWorld_BizHawkTool/.git archive --format zip --output64 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\output\Firmware temp
move gitsucks\output64\Firmware temp
rmdir /s /q gitsucks

2
Dist/MakeDiscohawk.bat
View File

@ -1,6 +1,6 @@
pushd %~dp0\
del /s DiscoHawk.zip
set DIR=..\output
set DIR=..\output64
set BUILDDIR=%~dp0
echo %BUILDIR%
cd "%DIR%"

2
Dist/RunILMerge.bat
View File

@ -1,2 +1,2 @@
@echo please copy "C:\Windows\Microsoft.NET\Framework\v3.0\WPF\PresentationUI.dll" to this directory. Dunno why.
ilmerge /v4 /target:WinExe /out:..\output\EmuHawk.merged.exe ..\output\EmuHawk.exe ..\output\BizHawk.Client.Common.dll ..\output\BizHawk.Common.dll ..\output\BizHawk.Emulation.Common.dll ..\output\BizHawk.Emulation.Cores.dll ..\output\BizHawk.Emulation.DiscSystem.dll "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\PresentationFramework.dll" PresentationUI.dll
ilmerge /v4 /target:WinExe /out:..\output64\EmuHawk.merged.exe ..\output64\EmuHawk.exe ..\output64\BizHawk.Client.Common.dll ..\output64\BizHawk.Common.dll ..\output64\BizHawk.Emulation.Common.dll ..\output64\BizHawk.Emulation.Cores.dll ..\output64\BizHawk.Emulation.DiscSystem.dll "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\PresentationFramework.dll" PresentationUI.dll