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@254 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2005-09-24 16:39:00 +00:00
parent 49176b50cc
commit 36a07386f0
4 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
make.msvc.bat
View file

@ -1,13 +1,17 @@
@ECHO OFF
if defined SMARTWINok_a (
goto STARTCOMPILING
)
:: Viual C++ 7.1
if defined VS71COMNTOOLS (
if exist "%VS71COMNTOOLS%\vsvars32.bat" (
echo -
echo - Visual C++ 7.1 found.
echo -
call "%VS71COMNTOOLS %\vsvars32.bat"
set TRY_THIS_SDK_PATH=%VS71COMNTOOLS%\..\..\..
call "%VS71COMNTOOLS%\vsvars32.bat"
set SMARTWINok_a=true
goto STARTCOMPILING
)
)
@ -19,7 +23,7 @@ if defined VS80COMNTOOLS (
echo - Visual C++ 8.0 found.
echo -
call "%VS80COMNTOOLS%\vsvars32.bat"
set TRY_THIS_SDK_PATH=%VS80COMNTOOLS%\..\..\..
set SMARTWINok_a=true
goto STARTCOMPILING
)
)
@ -31,7 +35,7 @@ if defined VCToolkitInstallDir (
echo - VC 7.1 Toolkit found.
echo -
call "%VCToolkitInstallDir%\vcvars32.bat"
set TRY_THIS_SDK_PATH=%VCToolkitInstallDir%\..
set SMARTWINok_a=true
goto STARTCOMPILING
)
)
@ -42,42 +46,36 @@ echo - No Visual C++ found, please set the enviroment variable
echo -
echo - VCToolkitInstallDir or VS71COMNTOOLS or VS80COMNTOOLS
echo -
echo - to your Visual Strudio folder which contains vsvars32.bat.
echo - to your Visual Studio folder which contains vsvars32.bat.
echo -
echo - Or call the vcvars32.bat/vcvarsall.bat file.
echo - Or call the vsvars32.bat.
echo -
goto ERROR
:STARTCOMPILING
:: SmartWin buid process
if defined SMARTWINok_a (
@ECHO ON
:: loki buid process
cd src
call make.msvc.bat
cd ..
cd examples
call make.msvc.bat
cd ..
cd test
call make.msvc.bat
cd ..
cd tools
call make.msvc.bat
cd ..
goto LEAVE
)
:ERROR
echo -
@ -86,4 +84,6 @@ echo - An error occured. Compiling aborted.
echo -
pause
:LEAVE
:LEAVE

2
test/RegressionTest/TypeTraitsTest2.h
View file

@ -109,7 +109,7 @@
#define ENABLE_ADDITIONAL_TYPETRAITS
#include <typetraits.h>
#include <loki/TypeTraits.h>
// Macros for testing isX variables

2
test/SafeFormat/main.cpp
View file

@ -9,7 +9,7 @@
// warranty.
////////////////////////////////////////////////////////////////////////////////
#include "SafeFormat.h"
#include "loki/SafeFormat.h"
#include <iostream>
#include <cassert>
#include <utility>

2
test/flex_string/main.cpp
View file

@ -24,7 +24,7 @@
//#define NO_ITERATOR_TRAITS
#endif
#include "flex/flex_string.h"
#include "loki/flex/flex_string.h"
#include <iostream>
#include <cstdio>