From cd4bc23da7c6af164777bdb41c4e5cef4f40f27f Mon Sep 17 00:00:00 2001 From: Peter Slattery Date: Mon, 20 Jan 2020 23:18:00 -0800 Subject: [PATCH] Both meta and main build files should be path agnostic --- build.bat | 7 ++++--- meta/build.bat | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.bat b/build.bat index d27a136..bd365d8 100644 --- a/build.bat +++ b/build.bat @@ -1,7 +1,7 @@ @echo off set ProjectDevRoot=C:\projects\test -set ProjectName=foldhaus +set ProjectName=Lumenarium set ProjectDevPath=%ProjectDevRoot%\%ProjectName% pushd %ProjectDevPath% @@ -19,7 +19,7 @@ pushd build del *.pdb > NUL 2> NUL REM Run the Preprocessor -..\build\foldhaus_meta.exe %ProjectDefPath%\src\foldhaus_app.cpp +foldhaus_meta.exe ..\src\foldhaus_app.cpp echo WAITING FOR PDB TO WRITE > lock.tmp @@ -30,5 +30,6 @@ del lock.tmp cl %CommonCompilerFlags% ..\src\win32_foldhaus.cpp /link %CommonLinkerFlags% user32.lib winmm.lib gdi32.lib opengl32.lib dsound.lib Ws2_32.lib Comdlg32.lib -incremental:no -C:\programs\ctime\ctime.exe -end C:\projects\foldhaus\build\win32_foldhaus_build_time.ctm %LastError% +C:\programs\ctime\ctime.exe -end %ProjectDevPath%\build\win32_foldhaus_build_time.ctm %LastError% +REM C:\programs\ctime\ctime.exe -stats %ProjectDevPath%\build\win32_foldhaus_build_time.ctm popd \ No newline at end of file diff --git a/meta/build.bat b/meta/build.bat index 5e21f70..bcd292e 100644 --- a/meta/build.bat +++ b/meta/build.bat @@ -1,7 +1,7 @@ @echo off -set ProjectDevRoot=C:\projects -set ProjectName=foldhaus +set ProjectDevRoot=C:\projects\test +set ProjectName=Lumenarium set ProjectDevPath=%ProjectDevRoot%\%ProjectName% pushd %ProjectDevPath% @@ -18,6 +18,6 @@ pushd build cl %CommonCompilerFlags% ..\meta\foldhaus_meta.cpp /link %CommonLinkerFlags% -C:\programs\ctime\ctime.exe -end C:\projects\foldhaus\build\win32_gs_meta_build_time.ctm %LastError% -C:\programs\ctime\ctime.exe -stats C:\projects\foldhaus\build\win32_gs_meta_build_time.ctm +C:\programs\ctime\ctime.exe -end %ProjectDevPath%\build\win32_gs_meta_build_time.ctm %LastError% +REM C:\programs\ctime\ctime.exe -stats %ProjectDevPath%\build\win32_gs_meta_build_time.ctm popd \ No newline at end of file