From bf9071ebdbe61aa314d23c11f1261dc7fa4bba0e Mon Sep 17 00:00:00 2001 From: syntheticpp Date: Mon, 19 Dec 2005 07:54:40 +0000 Subject: [PATCH] generate library also with the ms toolkit git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@383 7ec92016-0320-0410-acc4-a06ded1c099a --- make.mingw.bat | 3 ++- make.msvc.bat | 1 + src/make.msvc.bat | 9 +-------- test/Factory/make.msvc.bat | 7 ------- test/Longevity/make.msvc.bat | 18 ++---------------- test/OrderedStatic/make.msvc.bat | 9 +-------- test/RegressionTest/make.msvc.bat | 3 ++- test/SafeFormat/make.msvc.bat | 9 +-------- test/Singleton/make.msvc.bat | 23 +---------------------- test/SmallObj/make.msvc.bat | 3 ++- test/flex_string/make.msvc.bat | 7 ------- 11 files changed, 13 insertions(+), 79 deletions(-) diff --git a/make.mingw.bat b/make.mingw.bat index 28a4050..5007ec6 100755 --- a/make.mingw.bat +++ b/make.mingw.bat @@ -8,4 +8,5 @@ set LOKI_TMP= if not exist lib\ mkdir lib -mingw32-make +mingw32-make + diff --git a/make.msvc.bat b/make.msvc.bat index 892baba..98f9aaa 100755 --- a/make.msvc.bat +++ b/make.msvc.bat @@ -88,3 +88,4 @@ pause :LEAVE + diff --git a/src/make.msvc.bat b/src/make.msvc.bat index 091d5f2..81a62fb 100755 --- a/src/make.msvc.bat +++ b/src/make.msvc.bat @@ -1,15 +1,8 @@ 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 OrderedStatic.cpp -lib /NOLOGO /OUT:"..\lib\loki.lib" tmp\SmallObj.obj tmp\Singleton.obj tmp\OrderedStatic.obj +link /lib /NOLOGO /OUT:"..\lib\loki.lib" tmp\SmallObj.obj tmp\Singleton.obj tmp\OrderedStatic.obj -) else ( - -cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -I"." -I"..\include" -Fo..\lib\ SmallObj.cpp Singleton.cpp OrderedStatic.cpp - -) \ No newline at end of file diff --git a/test/Factory/make.msvc.bat b/test/Factory/make.msvc.bat index 4dc1b56..f7a7561 100755 --- a/test/Factory/make.msvc.bat +++ b/test/Factory/make.msvc.bat @@ -2,12 +2,5 @@ if not exist tmp\ mkdir tmp 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 - -) \ No newline at end of file diff --git a/test/Longevity/make.msvc.bat b/test/Longevity/make.msvc.bat index 361e93c..be56a06 100755 --- a/test/Longevity/make.msvc.bat +++ b/test/Longevity/make.msvc.bat @@ -5,27 +5,13 @@ if not exist tmp\ mkdir tmp 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 -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 - -) :: main2.cpp cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ main2.cpp -if not defined LOKI_MSVC_NOLIB ( +link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main2-msvc.exe" ..\..\lib\loki.lib tmp\main2.obj -link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main2-msvc.exe" ..\..\lib\loki.lib tmp\main2.obj - -) else ( - -link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main2-msvc.exe" tmp\main2.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj - -) diff --git a/test/OrderedStatic/make.msvc.bat b/test/OrderedStatic/make.msvc.bat index e643214..1accdc4 100755 --- a/test/OrderedStatic/make.msvc.bat +++ b/test/OrderedStatic/make.msvc.bat @@ -2,12 +2,5 @@ if not exist tmp\ mkdir tmp 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 -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\OrderedStatic.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj - -) diff --git a/test/RegressionTest/make.msvc.bat b/test/RegressionTest/make.msvc.bat index a2ac875..5a10cdc 100755 --- a/test/RegressionTest/make.msvc.bat +++ b/test/RegressionTest/make.msvc.bat @@ -2,4 +2,5 @@ if not exist tmp\ mkdir tmp cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ Test.cpp -link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\Test.obj +link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\Test.obj + diff --git a/test/SafeFormat/make.msvc.bat b/test/SafeFormat/make.msvc.bat index 5f698a5..2f65ed8 100755 --- a/test/SafeFormat/make.msvc.bat +++ b/test/SafeFormat/make.msvc.bat @@ -2,12 +2,5 @@ if not exist tmp\ mkdir tmp 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 -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 - -) \ No newline at end of file diff --git a/test/Singleton/make.msvc.bat b/test/Singleton/make.msvc.bat index c45b527..6d1a412 100755 --- a/test/Singleton/make.msvc.bat +++ b/test/Singleton/make.msvc.bat @@ -6,15 +6,8 @@ if not exist tmp\ mkdir tmp cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ DeletableSingleton.cpp -if not defined LOKI_MSVC_NOLIB ( - link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"DeletableSingleton-msvc.exe" ..\..\lib\loki.lib tmp\DeletableSingleton.obj -) else ( - -link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"DeletableSingleton-msvc.exe" tmp\DeletableSingleton.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj - -) @@ -22,15 +15,8 @@ link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"DeletableSingleton-msvc.ex cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ Phoenix.cpp -if not defined LOKI_MSVC_NOLIB ( - link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"Phoenix-msvc.exe" ..\..\lib\loki.lib tmp\Phoenix.obj -) else ( - -link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"Phoenix-msvc.exe" tmp\Phoenix.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj - -) @@ -38,12 +24,5 @@ link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"Phoenix-msvc.exe" tmp\Phoe cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ Dependencies.cpp -if not defined LOKI_MSVC_NOLIB ( +link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"Dependencies-msvc.exe" ..\..\lib\loki.lib tmp\Dependencies.obj -link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"Dependencies-msvc.exe" ..\..\lib\loki.lib tmp\Dependencies.obj - -) else ( - -link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"Dependencies-msvc.exe" tmp\Dependencies.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj - -) \ No newline at end of file diff --git a/test/SmallObj/make.msvc.bat b/test/SmallObj/make.msvc.bat index 89b53b4..176bc0a 100755 --- a/test/SmallObj/make.msvc.bat +++ b/test/SmallObj/make.msvc.bat @@ -40,4 +40,5 @@ link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:SmallSingleton-msvc.exe tmp @ECHO OFF set MTMD= -set OUT_EXE= \ No newline at end of file +set OUT_EXE= + diff --git a/test/flex_string/make.msvc.bat b/test/flex_string/make.msvc.bat index ff6a55a..2f65ed8 100755 --- a/test/flex_string/make.msvc.bat +++ b/test/flex_string/make.msvc.bat @@ -2,12 +2,5 @@ if not exist tmp\ mkdir tmp 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 - -) \ No newline at end of file