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

update include path

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@255 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2005-09-24 16:50:33 +00:00
parent 36a07386f0
commit 9429d59bd4
12 changed files with 27 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Makefile.mingw
View file

@ -4,8 +4,6 @@ MAKEFILE = Makefile.mingw
SUBTARGETS = \ SUBTARGETS = \
sub-src \ sub-src \
sub-test \ sub-test \
sub-examples \
sub-tools \
all: $(SUBTARGETS) all: $(SUBTARGETS)
@ -19,16 +17,6 @@ sub-test: FORCE
$(MAKE) -f $(MAKEFILE) $(MAKE) -f $(MAKEFILE)
@cd .. @cd ..
sub-examples: FORCE
cd examples && \
$(MAKE) -f $(MAKEFILE)
@cd ..
sub-tools: FORCE
cd tools && \
$(MAKE) -f $(MAKEFILE)
@cd ..
clean: clean:
@ -38,12 +26,6 @@ clean:
cd test && \ cd test && \
$(MAKE) -f $(MAKEFILE) clean $(MAKE) -f $(MAKEFILE) clean
@cd .. @cd ..
cd examples && \
$(MAKE) -f $(MAKEFILE) clean
@cd ..
cd tools && \
$(MAKE) -f $(MAKEFILE) clean
@cd ..

5
src/Makefile.mingw
View file

@ -1,12 +1,13 @@
CPP = g++ CPP = g++
CC = gcc CC = gcc
OBJ = tmp\Singleton.o tmp\SmallObj.o OBJ = tmp\Singleton.o tmp\SmallObj.o
LINKOBJ = tmp\Singleton.o tmp\SmallObj.o LINKOBJ = tmp\Singleton.o tmp\SmallObj.o
LIBS = -L"C:/Programme/Dev-Cpp/lib" -g3 LIBS = -L"C:/Programme/Dev-Cpp/lib" -g3
CXXINCS = -I"..\include" -I"..\include\loki" CXXINCS = -I"..\include"
BIN = ../lib/libloki.a BIN = ../lib/libloki.a
CXXFLAGS = $(CXXINCS) -W0 -O2 CXXFLAGS = $(CXXINCS) -W0 -O2 -DNDEBUG
CFLAGS = $(INCS) -g3 CFLAGS = $(INCS) -g3
RM = rm -f RM = rm -f
CHK_DIR_EXISTS= if not exist CHK_DIR_EXISTS= if not exist

2
src/make.msvc.bat
View file

@ -1,3 +1,3 @@
if not exist ..\lib\ mkdir ..\lib if not exist ..\lib\ mkdir ..\lib
cl -c -Zm200 -O1 -MT -EHsc -GR -W4 -I"." -I"..\include\loki" -Fo..\lib\ SmallObj.cpp Singleton.cpp cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W4 -I"." -I"..\include" -Fo..\lib\ SmallObj.cpp Singleton.cpp

6
test/Factory/Makefile.mingw
View file

@ -4,10 +4,10 @@ CPP = g++
CC = gcc CC = gcc
OBJ = tmp\Factory.o OBJ = tmp\Factory.o
LINKOBJ = tmp\Factory.o LINKOBJ = tmp\Factory.o
CXXINCS = -I./../include -I./../include/loki CXXINCS = -I./../../include
LIBS = -L../lib -lloki LIBS = -L../../lib -lloki
BIN = main-mingw.exe BIN = main-mingw.exe
CXXFLAGS = $(CXXINCS) -W0 -O2 CXXFLAGS = $(CXXINCS) -W0 -O2 -DNDEBUG
RM = rm -f RM = rm -f
CHK_DIR_EXISTS= if not exist CHK_DIR_EXISTS= if not exist
MKDIR = mkdir MKDIR = mkdir

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

@ -1,5 +1,5 @@
if not exist tmp\ mkdir tmp if not exist tmp\ mkdir tmp
cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\include" -I"..\include\loki" -Fotmp\ Factory.cpp 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 link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\Factory.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj

4
test/RegressionTest/Makefile.mingw
View file

@ -4,9 +4,9 @@ CPP = g++
CC = gcc CC = gcc
OBJ = tmp\Test.o OBJ = tmp\Test.o
LINKOBJ = tmp\Test.o LINKOBJ = tmp\Test.o
CXXINCS = -I./../../include -I./../../include/loki CXXINCS = -I./../../include
BIN = main-mingw.exe BIN = main-mingw.exe
CXXFLAGS = $(CXXINCS) -W0 -O2 CXXFLAGS = $(CXXINCS) -W0 -O2 -DNDEBUG
RM = rm -f RM = rm -f
CHK_DIR_EXISTS= if not exist CHK_DIR_EXISTS= if not exist
MKDIR = mkdir MKDIR = mkdir

2
test/RegressionTest/make.msvc.bat
View file

@ -1,5 +1,5 @@
if not exist tmp\ mkdir tmp if not exist tmp\ mkdir tmp
cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Fotmp\ Test.cpp 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

4
test/SafeFormat/Makefile.mingw
View file

@ -4,9 +4,9 @@ CPP = g++
CC = gcc CC = gcc
OBJ = tmp\main.o OBJ = tmp\main.o
LINKOBJ = tmp\main.o LINKOBJ = tmp\main.o
CXXINCS = -I./../../include -I./../../include/loki CXXINCS = -I./../../include
BIN = main-mingw.exe BIN = main-mingw.exe
CXXFLAGS = $(CXXINCS) -W0 -O2 CXXFLAGS = $(CXXINCS) -W0 -O2 -DNDEBUG
RM = rm -f RM = rm -f
CHK_DIR_EXISTS= if not exist CHK_DIR_EXISTS= if not exist
MKDIR = mkdir MKDIR = mkdir

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

@ -1,5 +1,5 @@
if not exist tmp\ mkdir tmp if not exist tmp\ mkdir tmp
cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Fotmp\ main.cpp 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 link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj

4
test/flex_string/Makefile.mingw
View file

@ -4,9 +4,9 @@ CPP = g++
CC = gcc CC = gcc
OBJ = tmp\main.o OBJ = tmp\main.o
LINKOBJ = tmp\main.o LINKOBJ = tmp\main.o
CXXINCS = -I./../../include -I./../../include/loki CXXINCS = -I./../../include
BIN = main-mingw.exe BIN = main-mingw.exe
CXXFLAGS = $(CXXINCS) -W0 -O2 CXXFLAGS = $(CXXINCS) -W0 -O2 -DNDEBUG
RM = rm -f RM = rm -f
CHK_DIR_EXISTS= if not exist CHK_DIR_EXISTS= if not exist
MKDIR = mkdir MKDIR = mkdir

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

@ -1,5 +1,5 @@
if not exist tmp\ mkdir tmp if not exist tmp\ mkdir tmp
cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Fotmp\ main.cpp 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 link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj

9
test/make.msvc.bat
View file

@ -1,8 +1,16 @@
cd Factory
call make.msvc.bat
cd ..
cd flex_string cd flex_string
call make.msvc.bat call make.msvc.bat
cd .. cd ..
cd RegressionTest
call make.msvc.bat
cd ..
cd SafeFormat cd SafeFormat
call make.msvc.bat call make.msvc.bat
cd .. cd ..
@ -10,3 +18,4 @@ cd ..
cd SmallObj cd SmallObj
call make.msvc.bat call make.msvc.bat
cd .. cd ..