King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update msvc build process

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@277 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2005-09-29 08:09:17 +00:00
parent 98734a38e9
commit dee53adb01
6 changed files with 44 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
make.msvc.bat
View file

@ -36,6 +36,7 @@ if defined VCToolkitInstallDir (
echo - echo -
call "%VCToolkitInstallDir%\vcvars32.bat" call "%VCToolkitInstallDir%\vcvars32.bat"
set LOKI_TMP=true set LOKI_TMP=true
set LOKI_MSVC_NOLIB=true
goto STARTCOMPILING goto STARTCOMPILING
) )
) )

12
src/make.msvc.bat
View file

@ -1,3 +1,15 @@
if not exist ..\lib\ mkdir ..\lib if not exist ..\lib\ mkdir ..\lib
if not defined LOKI_MSVC_NOLIB (
if not exist tmp\ mkdir tmp
cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -I"." -I"..\include" -Fo.\tmp\ SmallObj.cpp Singleton.cpp
lib /NOLOGO /OUT:"..\lib\loki.lib" tmp\SmallObj.obj tmp\Singleton.obj
) else (
cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -I"." -I"..\include" -Fo..\lib\ SmallObj.cpp Singleton.cpp cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -I"." -I"..\include" -Fo..\lib\ SmallObj.cpp Singleton.cpp
)

8
test/Factory/make.msvc.bat
View file

@ -2,4 +2,12 @@ if not exist tmp\ mkdir tmp
cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ Factory.cpp cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ Factory.cpp
if not defined LOKI_MSVC_NOLIB (
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" ..\..\lib\loki.lib tmp\Factory.obj
) else (
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\Factory.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\Factory.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj
)

5
test/RegressionTest/Test.cpp
View file

@ -20,7 +20,7 @@
#endif #endif
//#define LOKI_CLASS_LEVEL_THREADING //#define LOKI_CLASS_LEVEL_THREADING
#define LOKI_OBJECT_LEVEL_THREADING //#define LOKI_OBJECT_LEVEL_THREADING
// Some platforms might have difficulty with this // Some platforms might have difficulty with this
// Need to ifdef around those cases. // Need to ifdef around those cases.
@ -111,6 +111,9 @@ return result;
// $Log$ // $Log$
// Revision 1.7 2005/09/29 08:09:17 syntheticpp
// update msvc build process
//
// Revision 1.6 2005/09/26 07:33:05 syntheticpp // Revision 1.6 2005/09/26 07:33:05 syntheticpp
// move macros into LOKI_ namespace // move macros into LOKI_ namespace
// //

8
test/SafeFormat/make.msvc.bat
View file

@ -2,4 +2,12 @@ if not exist tmp\ mkdir tmp
cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ main.cpp cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ main.cpp
if not defined LOKI_MSVC_NOLIB (
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" ..\..\lib\loki.lib tmp\main.obj
) else (
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj
)

8
test/flex_string/make.msvc.bat
View file

@ -2,4 +2,12 @@ if not exist tmp\ mkdir tmp
cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ main.cpp cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ main.cpp
if not defined LOKI_MSVC_NOLIB (
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" ..\..\lib\loki.lib tmp\main.obj
) else (
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj
)