Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2570

Timestamp:

Jan 6, 2009, 10:54:20 AM (15 years ago)

Author:

rgrieder

Message:

Removed ogreceguirenderer from the include directories because the files can get included with OgreMain, which will result in errors. The other paths (cpptcl, ois, tinyxml, tolua) are not affected by this behaviour.

Location:

code/branches/buildsystem2

Files:

: 3 edited

src/CMakeLists.txt (modified) (1 diff)
src/orxonox/gui/GUIManager.cc (modified) (1 diff)
visual_studio/vc8/base.vsprops (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/branches/buildsystem2/src/CMakeLists.txt

r2569	r2570
18	18	INCLUDE_DIRECTORIES(
19	19	cpptcl
20		~~ogreceguirenderer~~
21	20	ois
22	21	tinyxml

code/branches/buildsystem2/src/orxonox/gui/GUIManager.cc

r2569	r2570
40	40	#include <CEGUI.h>
41	41	#include <CEGUILua.h>
42		#include <OgreCEGUIRenderer.h>
	42	#include <ogreceguirenderer/OgreCEGUIRenderer.h>
43	43
44	44	#include "util/Exception.h"

code/branches/buildsystem2/visual_studio/vc8/base.vsprops

r2569	r2570
8	8	<Tool
9	9	Name="VCCLCompilerTool"
10		AdditionalIncludeDirectories=""$(RootDir)src";"$(RootDir)\build\$(SolutionName)\$(ConfigurationName)";"$(RootDir)\build\$(SolutionName)\$(ConfigurationName)\orxonox";"$(RootDir)src\cpptcl";"$(RootDir)src\tinyxml";"$(RootDir)src\tolua";"$(RootDir)src\ois";"$(RootDir)src\orxonox";"$(RootDir)src\ceguilua-0.6.1\ceguilua";"$(~~RootDir)src\ogreceguirenderer";"$(~~LibDir)ogre-1.4.9\include";"$(LibDir)boost-1.35.0\include";"$(LibDir)cegui-0.6.1\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)openal-1.1\include";"$(LibDir)freealut-1.1.0\include";"$(LibDir)tcl-8.5.2\include";"$(LibDir)zlib-1.2.3\include";"$(LibDir)lua-5.1.3\include""
	10	AdditionalIncludeDirectories=""$(RootDir)src";"$(RootDir)\build\$(SolutionName)\$(ConfigurationName)";"$(RootDir)\build\$(SolutionName)\$(ConfigurationName)\orxonox";"$(RootDir)src\cpptcl";"$(RootDir)src\tinyxml";"$(RootDir)src\tolua";"$(RootDir)src\ois";"$(RootDir)src\orxonox";"$(RootDir)src\ceguilua-0.6.1\ceguilua";"$(LibDir)ogre-1.4.9\include";"$(LibDir)boost-1.35.0\include";"$(LibDir)cegui-0.6.1\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)openal-1.1\include";"$(LibDir)freealut-1.1.0\include";"$(LibDir)tcl-8.5.2\include";"$(LibDir)zlib-1.2.3\include";"$(LibDir)lua-5.1.3\include""
11	11	PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI;LUA_BUILD_AS_DLL;TIXML_USE_TICPP;_CRT_SECURE_NO_WARNINGS"
12	12	WarningLevel="3"

Note: See TracChangeset for help on using the changeset viewer.