diff options
| -rw-r--r-- | make-msvc.bat | 22 | ||||
| -rw-r--r-- | test/StormTest.cpp | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/make-msvc.bat b/make-msvc.bat index 007254e..099fc19 100644 --- a/make-msvc.bat +++ b/make-msvc.bat @@ -43,34 +43,34 @@ call %1 %2 if "%2" == "x86" set SLN_TRG=Win32 if "%2" == "x86" set LIB_TRG=lib32 if "%2" == "x64" set SLN_TRG=x64 -<<<<<<< HEAD if "%2" == "x64" set LIB_TRG=lib64 + +xcopy.exe /Y /D .\src\StormLib.h ..\aaa\inc +xcopy.exe /Y /D .\src\StormPort.h ..\aaa\inc + devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugAD|%SLN_TRG%" xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\DebugAD\*.lib ..\aaa\%LIB_TRG%%4 + devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugAS|%SLN_TRG%" xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\DebugAS\*.lib ..\aaa\%LIB_TRG%%4 + devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugUD|%SLN_TRG%" xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\DebugUD\*.lib ..\aaa\%LIB_TRG%%4 + devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugUS|%SLN_TRG%" xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\DebugUS\*.lib ..\aaa\%LIB_TRG%%4 + devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseAD|%SLN_TRG%" xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\ReleaseAD\*.lib ..\aaa\%LIB_TRG%%4 + devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseAS|%SLN_TRG%" xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\ReleaseAS\*.lib ..\aaa\%LIB_TRG%%4 + devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseUD|%SLN_TRG%" xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\ReleaseUD\*.lib ..\aaa\%LIB_TRG%%4 + devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseUS|%SLN_TRG%" xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\ReleaseUS\*.lib ..\aaa\%LIB_TRG%%4 -======= -devenv.com %3 /project "%LIB_NAME%" /build "DebugAD|%SLN_TRG%" -devenv.com %3 /project "%LIB_NAME%" /build "DebugAS|%SLN_TRG%" -devenv.com %3 /project "%LIB_NAME%" /build "DebugUD|%SLN_TRG%" -devenv.com %3 /project "%LIB_NAME%" /build "DebugUS|%SLN_TRG%" -devenv.com %3 /project "%LIB_NAME%" /build "ReleaseAD|%SLN_TRG%" -devenv.com %3 /project "%LIB_NAME%" /build "ReleaseAS|%SLN_TRG%" -devenv.com %3 /project "%LIB_NAME%" /build "ReleaseUD|%SLN_TRG%" -devenv.com %3 /project "%LIB_NAME%" /build "ReleaseUS|%SLN_TRG%" ->>>>>>> 1a94f94b50f6d829b1e8fba08a3002a5db4f00d5 :: Restore environment variables to the old level set INCLUDE=%SAVE_INCLUDE% diff --git a/test/StormTest.cpp b/test/StormTest.cpp index 1f8a334..4342e10 100644 --- a/test/StormTest.cpp +++ b/test/StormTest.cpp @@ -2646,7 +2646,7 @@ static DWORD TestOpenArchive_Corrupt(LPCTSTR szPlainName) // Opens a patched MPQ archive
static DWORD TestArchive_Patched(LPCTSTR PatchList[], LPCSTR szPatchedFile, DWORD dwFlags)
{
- TLogHelper Logger("OpenPatchedMpqTest", PatchList[0]);
+ TLogHelper Logger("PatchedMPQ", PatchList[0]);
HANDLE hMpq;
HANDLE hFile;
BYTE Buffer[0x100];
|