update build process

git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@285 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2005-10-05 18:14:21 +00:00
parent b44c50216e
commit 3156804c37
7 changed files with 38 additions and 10 deletions

View file

@ -4,6 +4,8 @@ MAKEFILE = Makefile
SUBTARGETS = \
sub-Factory \
sub-flex_string \
sub-Longevity \
sub-OrderedStatic \
sub-RegressionTest \
sub-SafeFormat \
sub-SmallObj
@ -35,6 +37,16 @@ sub-SmallObj: FORCE
$(MAKE) -f $(MAKEFILE)
@cd ..
sub-OrderedStatic: FORCE
cd OrderedStatic && \
$(MAKE) -f $(MAKEFILE)
@cd ..
sub-Longevity: FORCE
cd Longevity && \
$(MAKE) -f $(MAKEFILE)
@cd ..
clean:
cd Factory && \
$(MAKE) -f $(MAKEFILE) clean
@ -42,6 +54,12 @@ clean:
cd flex_string && \
$(MAKE) -f $(MAKEFILE) clean
@cd ..
cd Longevity && \
$(MAKE) -f $(MAKEFILE) clean
@cd ..
cd OrderedStatic && \
$(MAKE) -f $(MAKEFILE) clean
@cd ..
cd RegressionTest && \
$(MAKE) -f $(MAKEFILE) clean
@cd ..
@ -54,6 +72,5 @@ clean:
FORCE:

View file

@ -6,7 +6,7 @@ OBJ = main.o
LINKOBJ = main.o
CXXINCS = -I./../../include -I.
LIBS = -L../../lib -lloki
CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG -pedantic
CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
BIN = main-gcc.exe
RM = rm -f
CHK_DIR_EXISTS= if not exist

View file

@ -1,6 +1,6 @@
if not exist tmp\ mkdir tmp
cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -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 (
@ -8,6 +8,6 @@ link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" ..\..\lib\l
) else (
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj tmp\OrderedStatic.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\OrderedStatic.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj
)

View file

@ -7,6 +7,14 @@ cd flex_string
call make.msvc.bat
cd ..
cd Longevity
call make.msvc.bat
cd ..
cd OrderedStatic
call make.msvc.bat
cd ..
cd RegressionTest
call make.msvc.bat
cd ..