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

update build process

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

7
src/Makefile
View file

@ -2,8 +2,8 @@
CPP = g++
CC = gcc
OBJ = Singleton.o SmallObj.o
LINKOBJ = Singleton.o SmallObj.o
OBJ = Singleton.o SmallObj.o OrderedStatic.o
LINKOBJ = Singleton.o SmallObj.o OrderedStatic.o
LIBS =
CXXINCS = -I..\include
BIN = ../lib/libloki.a
@ -37,3 +37,6 @@ Singleton.o: Singleton.cpp
SmallObj.o: SmallObj.cpp
$(CPP) -c SmallObj.cpp -o SmallObj.o $(CXXFLAGS)
OrderedStatic.o: OrderedStatic.cpp
$(CPP) -c OrderedStatic.cpp -o OrderedStatic.o $(CXXFLAGS)

6
src/make.msvc.bat
View file

@ -4,12 +4,12 @@ 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
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
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
cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -I"." -I"..\include" -Fo..\lib\ SmallObj.cpp Singleton.cpp OrderedStatic.cpp
)