From 9429d59bd4e8ffe130649933039f8d2b843b05d4 Mon Sep 17 00:00:00 2001 From: syntheticpp Date: Sat, 24 Sep 2005 16:50:33 +0000 Subject: [PATCH] update include path git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@255 7ec92016-0320-0410-acc4-a06ded1c099a --- Makefile.mingw | 18 ------------------ src/Makefile.mingw | 5 +++-- src/make.msvc.bat | 2 +- test/Factory/Makefile.mingw | 6 +++--- test/Factory/make.msvc.bat | 4 ++-- test/RegressionTest/Makefile.mingw | 4 ++-- test/RegressionTest/make.msvc.bat | 2 +- test/SafeFormat/Makefile.mingw | 4 ++-- test/SafeFormat/make.msvc.bat | 2 +- test/flex_string/Makefile.mingw | 4 ++-- test/flex_string/make.msvc.bat | 2 +- test/make.msvc.bat | 9 +++++++++ 12 files changed, 27 insertions(+), 35 deletions(-) diff --git a/Makefile.mingw b/Makefile.mingw index 3165dfb..ac343d7 100755 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -4,8 +4,6 @@ MAKEFILE = Makefile.mingw SUBTARGETS = \ sub-src \ sub-test \ - sub-examples \ - sub-tools \ all: $(SUBTARGETS) @@ -19,16 +17,6 @@ sub-test: FORCE $(MAKE) -f $(MAKEFILE) @cd .. -sub-examples: FORCE - cd examples && \ - $(MAKE) -f $(MAKEFILE) - @cd .. - -sub-tools: FORCE - cd tools && \ - $(MAKE) -f $(MAKEFILE) - @cd .. - clean: @@ -38,12 +26,6 @@ clean: cd test && \ $(MAKE) -f $(MAKEFILE) clean @cd .. - cd examples && \ - $(MAKE) -f $(MAKEFILE) clean - @cd .. - cd tools && \ - $(MAKE) -f $(MAKEFILE) clean - @cd .. diff --git a/src/Makefile.mingw b/src/Makefile.mingw index 1cc4d12..f5b6b3e 100755 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -1,12 +1,13 @@ + CPP = g++ CC = gcc OBJ = tmp\Singleton.o tmp\SmallObj.o LINKOBJ = tmp\Singleton.o tmp\SmallObj.o LIBS = -L"C:/Programme/Dev-Cpp/lib" -g3 -CXXINCS = -I"..\include" -I"..\include\loki" +CXXINCS = -I"..\include" BIN = ../lib/libloki.a -CXXFLAGS = $(CXXINCS) -W0 -O2 +CXXFLAGS = $(CXXINCS) -W0 -O2 -DNDEBUG CFLAGS = $(INCS) -g3 RM = rm -f CHK_DIR_EXISTS= if not exist diff --git a/src/make.msvc.bat b/src/make.msvc.bat index bf137de..3b960e0 100755 --- a/src/make.msvc.bat +++ b/src/make.msvc.bat @@ -1,3 +1,3 @@ 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 diff --git a/test/Factory/Makefile.mingw b/test/Factory/Makefile.mingw index 36ef277..4230b88 100755 --- a/test/Factory/Makefile.mingw +++ b/test/Factory/Makefile.mingw @@ -4,10 +4,10 @@ CPP = g++ CC = gcc OBJ = tmp\Factory.o LINKOBJ = tmp\Factory.o -CXXINCS = -I./../include -I./../include/loki -LIBS = -L../lib -lloki +CXXINCS = -I./../../include +LIBS = -L../../lib -lloki BIN = main-mingw.exe -CXXFLAGS = $(CXXINCS) -W0 -O2 +CXXFLAGS = $(CXXINCS) -W0 -O2 -DNDEBUG RM = rm -f CHK_DIR_EXISTS= if not exist MKDIR = mkdir diff --git a/test/Factory/make.msvc.bat b/test/Factory/make.msvc.bat index ce695ef..021f3e7 100755 --- a/test/Factory/make.msvc.bat +++ b/test/Factory/make.msvc.bat @@ -1,5 +1,5 @@ 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 \ No newline at end of file +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/RegressionTest/Makefile.mingw b/test/RegressionTest/Makefile.mingw index 866cbae..b4701b2 100755 --- a/test/RegressionTest/Makefile.mingw +++ b/test/RegressionTest/Makefile.mingw @@ -4,9 +4,9 @@ CPP = g++ CC = gcc OBJ = tmp\Test.o LINKOBJ = tmp\Test.o -CXXINCS = -I./../../include -I./../../include/loki +CXXINCS = -I./../../include BIN = main-mingw.exe -CXXFLAGS = $(CXXINCS) -W0 -O2 +CXXFLAGS = $(CXXINCS) -W0 -O2 -DNDEBUG RM = rm -f CHK_DIR_EXISTS= if not exist MKDIR = mkdir diff --git a/test/RegressionTest/make.msvc.bat b/test/RegressionTest/make.msvc.bat index 6fd242e..a2ac875 100755 --- a/test/RegressionTest/make.msvc.bat +++ b/test/RegressionTest/make.msvc.bat @@ -1,5 +1,5 @@ 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 diff --git a/test/SafeFormat/Makefile.mingw b/test/SafeFormat/Makefile.mingw index b82f7f5..96cfbe9 100755 --- a/test/SafeFormat/Makefile.mingw +++ b/test/SafeFormat/Makefile.mingw @@ -4,9 +4,9 @@ CPP = g++ CC = gcc OBJ = tmp\main.o LINKOBJ = tmp\main.o -CXXINCS = -I./../../include -I./../../include/loki +CXXINCS = -I./../../include BIN = main-mingw.exe -CXXFLAGS = $(CXXINCS) -W0 -O2 +CXXFLAGS = $(CXXINCS) -W0 -O2 -DNDEBUG RM = rm -f CHK_DIR_EXISTS= if not exist MKDIR = mkdir diff --git a/test/SafeFormat/make.msvc.bat b/test/SafeFormat/make.msvc.bat index 16fc4d6..8ede424 100755 --- a/test/SafeFormat/make.msvc.bat +++ b/test/SafeFormat/make.msvc.bat @@ -1,5 +1,5 @@ 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 \ No newline at end of file diff --git a/test/flex_string/Makefile.mingw b/test/flex_string/Makefile.mingw index d5047bd..84b759c 100755 --- a/test/flex_string/Makefile.mingw +++ b/test/flex_string/Makefile.mingw @@ -4,9 +4,9 @@ CPP = g++ CC = gcc OBJ = tmp\main.o LINKOBJ = tmp\main.o -CXXINCS = -I./../../include -I./../../include/loki +CXXINCS = -I./../../include BIN = main-mingw.exe -CXXFLAGS = $(CXXINCS) -W0 -O2 +CXXFLAGS = $(CXXINCS) -W0 -O2 -DNDEBUG RM = rm -f CHK_DIR_EXISTS= if not exist MKDIR = mkdir diff --git a/test/flex_string/make.msvc.bat b/test/flex_string/make.msvc.bat index 16fc4d6..8ede424 100755 --- a/test/flex_string/make.msvc.bat +++ b/test/flex_string/make.msvc.bat @@ -1,5 +1,5 @@ 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 \ No newline at end of file diff --git a/test/make.msvc.bat b/test/make.msvc.bat index 44adaad..8cb3c85 100755 --- a/test/make.msvc.bat +++ b/test/make.msvc.bat @@ -1,8 +1,16 @@ +cd Factory +call make.msvc.bat +cd .. + cd flex_string call make.msvc.bat cd .. +cd RegressionTest +call make.msvc.bat +cd .. + cd SafeFormat call make.msvc.bat cd .. @@ -10,3 +18,4 @@ cd .. cd SmallObj call make.msvc.bat cd .. +