update msvc build process
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@277 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
parent
98734a38e9
commit
dee53adb01
6 changed files with 44 additions and 4 deletions
|
@ -36,6 +36,7 @@ if defined VCToolkitInstallDir (
|
|||
echo -
|
||||
call "%VCToolkitInstallDir%\vcvars32.bat"
|
||||
set LOKI_TMP=true
|
||||
set LOKI_MSVC_NOLIB=true
|
||||
goto STARTCOMPILING
|
||||
)
|
||||
)
|
||||
|
|
|
@ -1,3 +1,15 @@
|
|||
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
|
||||
|
||||
)
|
|
@ -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
|
||||
|
||||
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\Factory.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj
|
||||
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
|
||||
|
||||
)
|
|
@ -20,7 +20,7 @@
|
|||
#endif
|
||||
|
||||
//#define LOKI_CLASS_LEVEL_THREADING
|
||||
#define LOKI_OBJECT_LEVEL_THREADING
|
||||
//#define LOKI_OBJECT_LEVEL_THREADING
|
||||
|
||||
// Some platforms might have difficulty with this
|
||||
// Need to ifdef around those cases.
|
||||
|
@ -111,6 +111,9 @@ return result;
|
|||
|
||||
|
||||
// $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
|
||||
// move macros into LOKI_ namespace
|
||||
//
|
||||
|
|
|
@ -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
|
||||
|
||||
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj
|
||||
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
|
||||
|
||||
)
|
|
@ -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
|
||||
|
||||
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj
|
||||
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
|
||||
|
||||
)
|
Loading…
Add table
Reference in a new issue