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

2
test/RegressionTest/TypeTraitsTest2.h
View file

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

2
test/SafeFormat/main.cpp
View file

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

2
test/flex_string/main.cpp
View file

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