Changeset 1846 for code/branches
- Timestamp:
- Sep 28, 2008, 2:27:03 PM (16 years ago)
- Location:
- code/branches/orxonox_tutorial
- Files:
-
- 21 deleted
- 34 edited
- 21 copied
-
. (modified) (1 prop)
-
src/ceguilua-0.5.0b/ceguilua/CEGUILua.cpp (modified) (1 diff)
-
src/core/BaseObject.h (modified) (1 diff)
-
src/core/CMakeLists.txt (modified) (3 diffs)
-
src/core/Namespace.h (modified) (1 diff)
-
src/core/Super.h (modified) (1 diff)
-
src/core/XMLPort.h (modified) (1 diff)
-
src/network/ConnectionManager.cc (modified) (2 diffs)
-
src/network/Synchronisable.cc (modified) (1 diff)
-
src/network/Synchronisable.h (modified) (1 diff)
-
src/network/packet/Chat.h (modified) (1 diff)
-
src/network/packet/ClassID.cc (modified) (1 diff)
-
src/orxonox/CMakeLists.txt (modified) (3 diffs)
-
src/orxonox/OrxonoxStableHeaders.h (modified) (2 diffs)
-
src/orxonox/SignalHandler.cc (modified) (1 diff)
-
src/orxonox/gui/OgreCEGUIRenderer.h (modified) (1 diff)
-
src/orxonox/objects/WorldEntity.h (modified) (1 diff)
-
src/tolua/tolua-5.1.pkg (modified) (1 prop)
-
src/util/CMakeLists.txt (modified) (1 diff)
-
src/util/Convert.h (modified) (1 diff)
-
src/util/Exception.cc (modified) (1 prop)
-
src/util/Exception.h (modified) (1 prop)
-
src/util/Math.h (modified) (1 diff)
-
src/util/Sleep.h (modified) (1 diff)
-
src/util/XMLIncludes.h (deleted)
-
visual_studio/audio_properties.vsprops (deleted)
-
visual_studio/base_properties.vsprops (deleted)
-
visual_studio/base_properties_debug.vsprops (deleted)
-
visual_studio/base_properties_release.vsprops (deleted)
-
visual_studio/ceguilua_properties.vsprops (deleted)
-
visual_studio/core_properties.vsprops (deleted)
-
visual_studio/cpptcl_properties.vsprops (deleted)
-
visual_studio/directory_properties.vsprops (deleted)
-
visual_studio/lua_properties.vsprops (deleted)
-
visual_studio/network_properties.vsprops (deleted)
-
visual_studio/orxonox_properties.vsprops (deleted)
-
visual_studio/orxonox_vc8.sln (deleted)
-
visual_studio/tixml_properties.vsprops (deleted)
-
visual_studio/tolua_app_properties.vsprops (deleted)
-
visual_studio/tolua_gen_properties.vsprops (deleted)
-
visual_studio/tolua_properties.vsprops (deleted)
-
visual_studio/util_properties.vsprops (deleted)
-
visual_studio/vc8/audio.vcproj (modified) (3 diffs)
-
visual_studio/vc8/audio.vsprops (copied) (copied from code/trunk/visual_studio/vc8/audio.vsprops)
-
visual_studio/vc8/base.vsprops (copied) (copied from code/trunk/visual_studio/vc8/base.vsprops)
-
visual_studio/vc8/ceguilua.vcproj (modified) (3 diffs)
-
visual_studio/vc8/ceguilua.vsprops (copied) (copied from code/trunk/visual_studio/vc8/ceguilua.vsprops)
-
visual_studio/vc8/core.vcproj (modified) (4 diffs)
-
visual_studio/vc8/core.vsprops (copied) (copied from code/trunk/visual_studio/vc8/core.vsprops)
-
visual_studio/vc8/cpptcl.vcproj (modified) (3 diffs)
-
visual_studio/vc8/cpptcl.vsprops (copied) (copied from code/trunk/visual_studio/vc8/cpptcl.vsprops)
-
visual_studio/vc8/debug.vsprops (copied) (copied from code/trunk/visual_studio/vc8/debug.vsprops)
-
visual_studio/vc8/directories.vsprops (copied) (copied from code/trunk/visual_studio/vc8/directories.vsprops)
-
visual_studio/vc8/lua.vcproj (modified) (3 diffs)
-
visual_studio/vc8/lua.vsprops (copied) (copied from code/trunk/visual_studio/vc8/lua.vsprops)
-
visual_studio/vc8/network.vcproj (modified) (3 diffs)
-
visual_studio/vc8/network.vsprops (copied) (copied from code/trunk/visual_studio/vc8/network.vsprops)
-
visual_studio/vc8/ois.vcproj (modified) (12 diffs)
-
visual_studio/vc8/ois.vsprops (copied) (copied from code/trunk/visual_studio/vc8/ois.vsprops)
-
visual_studio/vc8/orxonox.vcproj (modified) (3 diffs)
-
visual_studio/vc8/orxonox.vsprops (copied) (copied from code/trunk/visual_studio/vc8/orxonox.vsprops)
-
visual_studio/vc8/orxonox_vc8.sln (copied) (copied from code/trunk/visual_studio/vc8/orxonox_vc8.sln)
-
visual_studio/vc8/release.vsprops (copied) (copied from code/trunk/visual_studio/vc8/release.vsprops)
-
visual_studio/vc8/tinyxml.vcproj (copied) (copied from code/trunk/visual_studio/vc8/tinyxml.vcproj)
-
visual_studio/vc8/tinyxml.vsprops (copied) (copied from code/trunk/visual_studio/vc8/tinyxml.vsprops)
-
visual_studio/vc8/tixml.vcproj (deleted)
-
visual_studio/vc8/tolua.vcproj (modified) (3 diffs)
-
visual_studio/vc8/tolua.vsprops (copied) (copied from code/trunk/visual_studio/vc8/tolua.vsprops)
-
visual_studio/vc8/tolua_app.vcproj (deleted)
-
visual_studio/vc8/tolua_gen.vcproj (deleted)
-
visual_studio/vc8/toluagen.vcproj (copied) (copied from code/trunk/visual_studio/vc8/toluagen.vcproj)
-
visual_studio/vc8/toluagen.vsprops (copied) (copied from code/trunk/visual_studio/vc8/toluagen.vsprops)
-
visual_studio/vc8/toluagen_orxonox.vcproj (copied) (copied from code/trunk/visual_studio/vc8/toluagen_orxonox.vcproj)
-
visual_studio/vc8/toluagen_orxonox.vsprops (copied) (copied from code/trunk/visual_studio/vc8/toluagen_orxonox.vsprops)
-
visual_studio/vc8/util.vcproj (modified) (4 diffs)
-
visual_studio/vc8/util.vsprops (copied) (copied from code/trunk/visual_studio/vc8/util.vsprops)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/orxonox_tutorial
- Property svn:mergeinfo changed
/code/trunk (added) merged: 1832,1836-1844
- Property svn:mergeinfo changed
-
code/branches/orxonox_tutorial/src/ceguilua-0.5.0b/ceguilua/CEGUILua.cpp
r1810 r1846 38 38 #include "tolua/tolua++.h" 39 39 40 #include "tolua++.h"41 42 40 // prototype for bindings initialisation function 43 41 int tolua_CEGUI_open(lua_State* tolua_S); -
code/branches/orxonox_tutorial/src/core/BaseObject.h
r1747 r1846 41 41 #include "Super.h" 42 42 #include "OrxonoxClass.h" 43 #include " util/XMLIncludes.h"43 #include "XMLIncludes.h" 44 44 45 45 namespace orxonox -
code/branches/orxonox_tutorial/src/core/CMakeLists.txt
r1815 r1846 56 56 GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION) 57 57 ADD_CUSTOM_COMMAND( 58 OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc 58 OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h 59 59 COMMAND ${TOLUA_EXE} -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg 60 60 DEPENDS … … 70 70 TARGET_LINK_LIBRARIES(core 71 71 ${OGRE_LIBRARIES} 72 ${Boost_thread_LIBRARIES} 73 ${Boost_filesystem_LIBRARIES} 72 74 lua_orxonox 73 75 cpptcl_orxonox … … 76 78 tolualib_orxonox 77 79 util 78 ${Boost_thread_LIBRARIES}79 ${Boost_filesystem_LIBRARIES}80 80 ) -
code/branches/orxonox_tutorial/src/core/Namespace.h
r1505 r1846 34 34 #include <map> 35 35 36 #include " util/XMLIncludes.h"36 #include "XMLIncludes.h" 37 37 #include "BaseObject.h" 38 38 -
code/branches/orxonox_tutorial/src/core/Super.h
r1747 r1846 72 72 73 73 #include "util/Debug.h" 74 #include " util/XMLIncludes.h"74 #include "XMLIncludes.h" 75 75 76 76 /////////////////////// -
code/branches/orxonox_tutorial/src/core/XMLPort.h
r1789 r1846 33 33 34 34 #include "util/Debug.h" 35 #include "util/XMLIncludes.h"36 35 #include "util/MultiType.h" 37 36 #include "tinyxml/ticpp.h" 37 #include "XMLIncludes.h" 38 38 #include "Executor.h" 39 39 #include "CoreIncludes.h" -
code/branches/orxonox_tutorial/src/network/ConnectionManager.cc
r1755 r1846 37 37 // Author: Oliver Scheuss 38 38 // 39 40 #include "ConnectionManager.h" 39 41 40 42 #include <iostream> … … 51 53 #include "util/Sleep.h" 52 54 #include "ClientInformation.h" 53 #include "ConnectionManager.h"54 55 #include "Synchronisable.h" 55 56 #include "packet/ClassID.h" -
code/branches/orxonox_tutorial/src/network/Synchronisable.cc
r1758 r1846 41 41 #include "Synchronisable.h" 42 42 43 #include < string>43 #include <cstring> 44 44 #include <iostream> 45 45 #include <assert.h> -
code/branches/orxonox_tutorial/src/network/Synchronisable.h
r1751 r1846 34 34 #include <list> 35 35 #include "core/OrxonoxClass.h" 36 #include " util/XMLIncludes.h"36 #include "core/XMLIncludes.h" 37 37 #include "NetworkCallback.h" 38 38 -
code/branches/orxonox_tutorial/src/network/packet/Chat.h
r1763 r1846 4 4 5 5 #include <string> 6 #include <cstring> 6 7 7 8 #include "Packet.h" -
code/branches/orxonox_tutorial/src/network/packet/ClassID.cc
r1763 r1846 31 31 #include "ClassID.h" 32 32 #include "core/CoreIncludes.h" 33 #include < string>33 #include <cstring> 34 34 #include <assert.h> 35 35 -
code/branches/orxonox_tutorial/src/orxonox/CMakeLists.txt
r1817 r1846 34 34 overlays/hud/HUDSpeedBar.cc 35 35 36 tolua/tolua_bind.cc37 38 36 tools/BillboardSet.cc 39 37 tools/Light.cc … … 64 62 objects/RotatingProjectile.cc 65 63 objects/ParticleProjectile.cc 64 65 tolua/tolua_bind.cc 66 66 ) 67 67 68 68 GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION) 69 69 ADD_CUSTOM_COMMAND( 70 OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc 70 OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h 71 71 COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg 72 72 DEPENDS … … 105 105 tinyxml_orxonox 106 106 tolualib_orxonox 107 ois_orxonox108 107 util 109 108 core -
code/branches/orxonox_tutorial/src/orxonox/OrxonoxStableHeaders.h
r1810 r1846 79 79 #include "util/String.h" 80 80 #include "util/SubString.h" 81 #include "util/XMLIncludes.h"82 81 83 82 #include "core/BaseObject.h" … … 87 86 #include "core/CommandExecutor.h" 88 87 #include "core/Executor.h" 88 #include "core/XMLIncludes.h" 89 89 #include "core/XMLPort.h" 90 90 -
code/branches/orxonox_tutorial/src/orxonox/SignalHandler.cc
r1747 r1846 38 38 #include <assert.h> 39 39 #include <iostream> 40 #include <cstdlib> 41 #include <cstring> 40 42 41 43 SignalHandler * SignalHandler::singletonRef = NULL; -
code/branches/orxonox_tutorial/src/orxonox/gui/OgreCEGUIRenderer.h
r1784 r1846 38 38 #include <OgreTextureUnitState.h> 39 39 40 #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB) 41 # ifdef OGRE_GUIRENDERER_EXPORTS 40 /** CHANGES MADE BY ORXONOX TO FIT DLL IMPORT/EXPORT **/ 41 #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !(defined(ORXONOX_STATIC_BUILD) || defined(ORXONOX_NO_EXPORTS)) 42 # ifdef ORXONOX_SHARED_BUILD 42 43 # define OGRE_GUIRENDERER_API __declspec(dllexport) 43 44 # else -
code/branches/orxonox_tutorial/src/orxonox/objects/WorldEntity.h
r1755 r1846 35 35 #include <OgreSceneNode.h> 36 36 #include "util/Math.h" 37 #include "util/XMLIncludes.h"38 37 #include "network/Synchronisable.h" 38 #include "core/XMLIncludes.h" 39 39 #include "core/BaseObject.h" 40 40 #include "Tickable.h" 41 #include " ../tools/Mesh.h"41 #include "tools/Mesh.h" 42 42 43 43 namespace orxonox -
code/branches/orxonox_tutorial/src/tolua/tolua-5.1.pkg
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/orxonox_tutorial/src/util/CMakeLists.txt
r1821 r1846 20 20 TARGET_LINK_LIBRARIES(util 21 21 ${OGRE_LIBRARIES} 22 ${Lua_LIBRARIES}23 22 ) -
code/branches/orxonox_tutorial/src/util/Convert.h
r1791 r1846 39 39 #include <string> 40 40 #include <sstream> 41 #include <typeinfo> 41 42 42 43 #include "Math.h" -
code/branches/orxonox_tutorial/src/util/Exception.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/orxonox_tutorial/src/util/Exception.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/orxonox_tutorial/src/util/Math.h
r1823 r1846 220 220 inline _UtilExport float rnd() 221 221 { 222 return ((float)rand() / (RAND_MAX + 1));222 return rand() / (RAND_MAX + 1.0); 223 223 } 224 224 -
code/branches/orxonox_tutorial/src/util/Sleep.h
r1755 r1846 39 39 40 40 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 41 42 #ifndef WIN32_LEAN_AND_MEAN 43 # define WIN32_LEAN_AND_MEAN 44 #endif 45 #include <windows.h> 41 #include <winbase.h> 46 42 47 43 inline void usleep(DWORD dwMicroseconds) -
code/branches/orxonox_tutorial/visual_studio/vc8/audio.vcproj
r1625 r1846 5 5 Name="audio" 6 6 ProjectGUID="{4733BD1A-E04C-458D-8BFB-5010250EA497}" 7 RootNamespace=" FICN"7 RootNamespace="orxonox" 8 8 Keyword="Win32Proj" 9 9 > … … 19 19 Name="Debug|Win32" 20 20 ConfigurationType="2" 21 InheritedPropertySheets=" $(SolutionDir)base_properties_debug.vsprops;..\audio_properties.vsprops"21 InheritedPropertySheets=".\debug.vsprops;.\audio.vsprops" 22 22 CharacterSet="1" 23 23 > … … 80 80 Name="Release|Win32" 81 81 ConfigurationType="2" 82 InheritedPropertySheets=" $(SolutionDir)base_properties_release.vsprops;..\audio_properties.vsprops"82 InheritedPropertySheets=".\release.vsprops;.\audio.vsprops" 83 83 CharacterSet="1" 84 84 WholeProgramOptimization="0" -
code/branches/orxonox_tutorial/visual_studio/vc8/ceguilua.vcproj
r1810 r1846 5 5 Name="ceguilua" 6 6 ProjectGUID="{4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}" 7 RootNamespace=" FICN"7 RootNamespace="orxonox" 8 8 Keyword="Win32Proj" 9 9 > … … 19 19 Name="Debug|Win32" 20 20 ConfigurationType="2" 21 InheritedPropertySheets=" $(SolutionDir)base_properties_debug.vsprops;..\ceguilua_properties.vsprops"21 InheritedPropertySheets=".\debug.vsprops;.\ceguilua.vsprops" 22 22 CharacterSet="1" 23 23 > … … 80 80 Name="Release|Win32" 81 81 ConfigurationType="2" 82 InheritedPropertySheets=" $(SolutionDir)base_properties_release.vsprops;..\ceguilua_properties.vsprops"82 InheritedPropertySheets=".\release.vsprops;.\ceguilua.vsprops" 83 83 CharacterSet="1" 84 84 WholeProgramOptimization="0" -
code/branches/orxonox_tutorial/visual_studio/vc8/core.vcproj
r1815 r1846 5 5 Name="core" 6 6 ProjectGUID="{271715F3-5B90-4110-A552-70C788084A86}" 7 RootNamespace=" FICN"7 RootNamespace="orxonox" 8 8 Keyword="Win32Proj" 9 9 > … … 19 19 Name="Debug|Win32" 20 20 ConfigurationType="2" 21 InheritedPropertySheets=" $(SolutionDir)base_properties_debug.vsprops;..\core_properties.vsprops"21 InheritedPropertySheets=".\debug.vsprops;.\core.vsprops" 22 22 CharacterSet="1" 23 23 > … … 80 80 Name="Release|Win32" 81 81 ConfigurationType="2" 82 InheritedPropertySheets=" $(SolutionDir)base_properties_release.vsprops;..\core_properties.vsprops"82 InheritedPropertySheets=".\release.vsprops;.\core.vsprops" 83 83 CharacterSet="1" 84 84 WholeProgramOptimization="0" … … 416 416 > 417 417 </File> 418 <File 419 RelativePath="..\..\src\core\XMLIncludes.h" 420 > 421 </File> 418 422 <Filter 419 423 Name="input" -
code/branches/orxonox_tutorial/visual_studio/vc8/cpptcl.vcproj
r1567 r1846 5 5 Name="cpptcl" 6 6 ProjectGUID="{53C56131-E2AA-4A27-B460-7AC05D61A0E6}" 7 RootNamespace=" FICN"7 RootNamespace="orxonox" 8 8 Keyword="Win32Proj" 9 9 > … … 19 19 Name="Debug|Win32" 20 20 ConfigurationType="4" 21 InheritedPropertySheets=" $(SolutionDir)base_properties_debug.vsprops;..\cpptcl_properties.vsprops"21 InheritedPropertySheets=".\debug.vsprops;.\cpptcl.vsprops" 22 22 CharacterSet="1" 23 23 > … … 71 71 Name="Release|Win32" 72 72 ConfigurationType="4" 73 InheritedPropertySheets=" $(SolutionDir)base_properties_release.vsprops;..\cpptcl_properties.vsprops"73 InheritedPropertySheets=".\release.vsprops;.\cpptcl.vsprops" 74 74 CharacterSet="1" 75 75 WholeProgramOptimization="0" -
code/branches/orxonox_tutorial/visual_studio/vc8/lua.vcproj
r1815 r1846 5 5 Name="lua" 6 6 ProjectGUID="{63B3E57A-4382-42F3-85EC-E869CFCCA88F}" 7 RootNamespace=" FICN"7 RootNamespace="orxonox" 8 8 Keyword="Win32Proj" 9 9 > … … 19 19 Name="Debug|Win32" 20 20 ConfigurationType="2" 21 InheritedPropertySheets=" $(SolutionDir)base_properties_debug.vsprops;..\lua_properties.vsprops"21 InheritedPropertySheets=".\debug.vsprops;.\lua.vsprops" 22 22 CharacterSet="1" 23 23 > … … 80 80 Name="Release|Win32" 81 81 ConfigurationType="2" 82 InheritedPropertySheets=" $(SolutionDir)base_properties_release.vsprops;..\lua_properties.vsprops"82 InheritedPropertySheets=".\release.vsprops;.\lua.vsprops" 83 83 CharacterSet="1" 84 84 WholeProgramOptimization="0" -
code/branches/orxonox_tutorial/visual_studio/vc8/network.vcproj
r1735 r1846 5 5 Name="network" 6 6 ProjectGUID="{35575B59-E1AE-40E8-89C4-2862B5B09B68}" 7 RootNamespace=" FICN"7 RootNamespace="orxonox" 8 8 Keyword="Win32Proj" 9 9 > … … 19 19 Name="Debug|Win32" 20 20 ConfigurationType="4" 21 InheritedPropertySheets=" $(SolutionDir)base_properties_debug.vsprops;..\network_properties.vsprops"21 InheritedPropertySheets=".\debug.vsprops;.\network.vsprops" 22 22 CharacterSet="1" 23 23 > … … 71 71 Name="Release|Win32" 72 72 ConfigurationType="4" 73 InheritedPropertySheets=" $(SolutionDir)base_properties_release.vsprops;..\network_properties.vsprops"73 InheritedPropertySheets=".\release.vsprops;.\network.vsprops" 74 74 CharacterSet="1" 75 75 WholeProgramOptimization="0" -
code/branches/orxonox_tutorial/visual_studio/vc8/ois.vcproj
r1755 r1846 4 4 Version="8.00" 5 5 Name="ois" 6 ProjectGUID="{ 9CC704CB-4956-4479-BDEC-57CBC03F700E}"7 RootNamespace=" OIS"6 ProjectGUID="{EA969DF2-70AF-46E6-BBE2-E03112E04CB8}" 7 RootNamespace="orxonox" 8 8 Keyword="Win32Proj" 9 9 > … … 12 12 Name="Win32" 13 13 /> 14 <Platform15 Name="x64"16 />17 14 </Platforms> 18 15 <ToolFiles> … … 20 17 <Configurations> 21 18 <Configuration 19 Name="Debug|Win32" 20 ConfigurationType="2" 21 InheritedPropertySheets=".\debug.vsprops;.\ois.vsprops" 22 CharacterSet="2" 23 > 24 <Tool 25 Name="VCPreBuildEventTool" 26 /> 27 <Tool 28 Name="VCCustomBuildTool" 29 /> 30 <Tool 31 Name="VCXMLDataGeneratorTool" 32 /> 33 <Tool 34 Name="VCWebServiceProxyGeneratorTool" 35 /> 36 <Tool 37 Name="VCMIDLTool" 38 /> 39 <Tool 40 Name="VCCLCompilerTool" 41 /> 42 <Tool 43 Name="VCManagedResourceCompilerTool" 44 /> 45 <Tool 46 Name="VCResourceCompilerTool" 47 /> 48 <Tool 49 Name="VCPreLinkEventTool" 50 /> 51 <Tool 52 Name="VCLinkerTool" 53 /> 54 <Tool 55 Name="VCALinkTool" 56 /> 57 <Tool 58 Name="VCManifestTool" 59 /> 60 <Tool 61 Name="VCXDCMakeTool" 62 /> 63 <Tool 64 Name="VCBscMakeTool" 65 /> 66 <Tool 67 Name="VCFxCopTool" 68 /> 69 <Tool 70 Name="VCAppVerifierTool" 71 /> 72 <Tool 73 Name="VCWebDeploymentTool" 74 /> 75 <Tool 76 Name="VCPostBuildEventTool" 77 /> 78 </Configuration> 79 <Configuration 22 80 Name="Release|Win32" 23 81 ConfigurationType="2" 24 InheritedPropertySheets=". .\directory_properties.vsprops"82 InheritedPropertySheets=".\release.vsprops;.\ois.vsprops" 25 83 CharacterSet="2" 26 84 WholeProgramOptimization="0" … … 43 101 <Tool 44 102 Name="VCCLCompilerTool" 45 AdditionalOptions="/MP2"46 Optimization="2"47 InlineFunctionExpansion="1"48 OmitFramePointers="true"49 AdditionalIncludeDirectories="$(RootDir)src\ois"50 PreprocessorDefinitions="WIN32;NDEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"51 StringPooling="true"52 RuntimeLibrary="2"53 BufferSecurityCheck="false"54 EnableFunctionLevelLinking="false"55 FloatingPointModel="2"56 RuntimeTypeInfo="true"57 UsePrecompiledHeader="0"58 PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"59 WarningLevel="3"60 Detect64BitPortabilityProblems="true"61 DebugInformationFormat="3"62 103 /> 63 104 <Tool … … 72 113 <Tool 73 114 Name="VCLinkerTool" 74 AdditionalDependencies="dxguid.lib dinput8.lib"75 AdditionalLibraryDirectories=""76 GenerateDebugInformation="true"77 OptimizeReferences="2"78 EnableCOMDATFolding="2"79 OptimizeForWindows98="1"80 ImportLibrary="$(RootDir)lib\$(TargetName).lib"81 115 /> 82 116 <Tool … … 103 137 <Tool 104 138 Name="VCPostBuildEventTool" 105 CommandLine=""106 />107 </Configuration>108 <Configuration109 Name="Debug|Win32"110 ConfigurationType="2"111 InheritedPropertySheets="..\directory_properties.vsprops"112 CharacterSet="2"113 >114 <Tool115 Name="VCPreBuildEventTool"116 />117 <Tool118 Name="VCCustomBuildTool"119 />120 <Tool121 Name="VCXMLDataGeneratorTool"122 />123 <Tool124 Name="VCWebServiceProxyGeneratorTool"125 />126 <Tool127 Name="VCMIDLTool"128 />129 <Tool130 Name="VCCLCompilerTool"131 AdditionalOptions="/MP2"132 Optimization="0"133 AdditionalIncludeDirectories="$(RootDir)\src\ois"134 PreprocessorDefinitions="WIN32;_DEBUG;_STLP_DEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"135 MinimalRebuild="true"136 BasicRuntimeChecks="3"137 RuntimeLibrary="3"138 FloatingPointModel="2"139 RuntimeTypeInfo="true"140 UsePrecompiledHeader="0"141 PrecompiledHeaderThrough="StdAfx.h"142 WarningLevel="3"143 Detect64BitPortabilityProblems="true"144 DebugInformationFormat="4"145 CallingConvention="0"146 />147 <Tool148 Name="VCManagedResourceCompilerTool"149 />150 <Tool151 Name="VCResourceCompilerTool"152 />153 <Tool154 Name="VCPreLinkEventTool"155 />156 <Tool157 Name="VCLinkerTool"158 AdditionalDependencies="dxguid.lib dinput8.lib"159 OutputFile="$(OutDir)\$(ProjectName)_d.dll"160 AdditionalLibraryDirectories=""161 GenerateDebugInformation="true"162 ImportLibrary="$(RootDir)lib\$(TargetName).lib"163 />164 <Tool165 Name="VCALinkTool"166 />167 <Tool168 Name="VCManifestTool"169 />170 <Tool171 Name="VCXDCMakeTool"172 />173 <Tool174 Name="VCBscMakeTool"175 />176 <Tool177 Name="VCFxCopTool"178 />179 <Tool180 Name="VCAppVerifierTool"181 />182 <Tool183 Name="VCWebDeploymentTool"184 />185 <Tool186 Name="VCPostBuildEventTool"187 CommandLine=""188 />189 </Configuration>190 <Configuration191 Name="Debug|x64"192 OutputDirectory="..\lib64\"193 IntermediateDirectory="..\lib64\obj\$(ConfigurationName)"194 ConfigurationType="4"195 CharacterSet="2"196 >197 <Tool198 Name="VCPreBuildEventTool"199 />200 <Tool201 Name="VCCustomBuildTool"202 />203 <Tool204 Name="VCXMLDataGeneratorTool"205 />206 <Tool207 Name="VCWebServiceProxyGeneratorTool"208 />209 <Tool210 Name="VCMIDLTool"211 TargetEnvironment="3"212 />213 <Tool214 Name="VCCLCompilerTool"215 Optimization="0"216 AdditionalIncludeDirectories="..\includes"217 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_STLP_DEBUG"218 MinimalRebuild="true"219 BasicRuntimeChecks="3"220 RuntimeLibrary="3"221 FloatingPointModel="2"222 RuntimeTypeInfo="true"223 UsePrecompiledHeader="0"224 PrecompiledHeaderThrough="StdAfx.h"225 WarningLevel="3"226 Detect64BitPortabilityProblems="true"227 DebugInformationFormat="3"228 CallingConvention="0"229 />230 <Tool231 Name="VCManagedResourceCompilerTool"232 />233 <Tool234 Name="VCResourceCompilerTool"235 />236 <Tool237 Name="VCPreLinkEventTool"238 />239 <Tool240 Name="VCLibrarianTool"241 AdditionalDependencies="dxguid.lib dinput8.lib"242 OutputFile="$(OutDir)/OIS_d.lib"243 />244 <Tool245 Name="VCALinkTool"246 />247 <Tool248 Name="VCXDCMakeTool"249 />250 <Tool251 Name="VCBscMakeTool"252 />253 <Tool254 Name="VCFxCopTool"255 />256 <Tool257 Name="VCPostBuildEventTool"258 CommandLine=""259 />260 </Configuration>261 <Configuration262 Name="Release|x64"263 OutputDirectory="..\lib64\"264 IntermediateDirectory="..\lib64\obj\$(ConfigurationName)"265 ConfigurationType="4"266 CharacterSet="2"267 WholeProgramOptimization="1"268 >269 <Tool270 Name="VCPreBuildEventTool"271 />272 <Tool273 Name="VCCustomBuildTool"274 />275 <Tool276 Name="VCXMLDataGeneratorTool"277 />278 <Tool279 Name="VCWebServiceProxyGeneratorTool"280 />281 <Tool282 Name="VCMIDLTool"283 TargetEnvironment="3"284 />285 <Tool286 Name="VCCLCompilerTool"287 Optimization="2"288 InlineFunctionExpansion="1"289 FavorSizeOrSpeed="1"290 OmitFramePointers="true"291 EnableFiberSafeOptimizations="true"292 WholeProgramOptimization="true"293 AdditionalIncludeDirectories="..\includes"294 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"295 StringPooling="true"296 RuntimeLibrary="2"297 EnableFunctionLevelLinking="true"298 FloatingPointModel="2"299 RuntimeTypeInfo="true"300 UsePrecompiledHeader="0"301 PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"302 WarningLevel="3"303 Detect64BitPortabilityProblems="true"304 DebugInformationFormat="3"305 />306 <Tool307 Name="VCManagedResourceCompilerTool"308 />309 <Tool310 Name="VCResourceCompilerTool"311 />312 <Tool313 Name="VCPreLinkEventTool"314 />315 <Tool316 Name="VCLibrarianTool"317 AdditionalDependencies="dxguid.lib dinput8.lib"318 OutputFile="$(OutDir)/OIS.lib"319 />320 <Tool321 Name="VCALinkTool"322 />323 <Tool324 Name="VCXDCMakeTool"325 />326 <Tool327 Name="VCBscMakeTool"328 />329 <Tool330 Name="VCFxCopTool"331 />332 <Tool333 Name="VCPostBuildEventTool"334 CommandLine=""335 />336 </Configuration>337 <Configuration338 Name="OIS_ReleaseDll|x64"339 OutputDirectory="..\dll64"340 IntermediateDirectory="..\dll64\$(ConfigurationName)"341 ConfigurationType="2"342 CharacterSet="2"343 WholeProgramOptimization="1"344 >345 <Tool346 Name="VCPreBuildEventTool"347 />348 <Tool349 Name="VCCustomBuildTool"350 />351 <Tool352 Name="VCXMLDataGeneratorTool"353 />354 <Tool355 Name="VCWebServiceProxyGeneratorTool"356 />357 <Tool358 Name="VCMIDLTool"359 TargetEnvironment="3"360 />361 <Tool362 Name="VCCLCompilerTool"363 Optimization="2"364 InlineFunctionExpansion="1"365 FavorSizeOrSpeed="1"366 OmitFramePointers="true"367 EnableFiberSafeOptimizations="true"368 WholeProgramOptimization="true"369 AdditionalIncludeDirectories="..\includes"370 PreprocessorDefinitions="WIN32;NDEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"371 StringPooling="true"372 RuntimeLibrary="2"373 EnableFunctionLevelLinking="true"374 FloatingPointModel="2"375 RuntimeTypeInfo="true"376 UsePrecompiledHeader="0"377 PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"378 WarningLevel="3"379 Detect64BitPortabilityProblems="true"380 DebugInformationFormat="3"381 />382 <Tool383 Name="VCManagedResourceCompilerTool"384 />385 <Tool386 Name="VCResourceCompilerTool"387 />388 <Tool389 Name="VCPreLinkEventTool"390 />391 <Tool392 Name="VCLinkerTool"393 AdditionalDependencies="dxguid.lib dinput8.lib"394 GenerateDebugInformation="true"395 TargetMachine="17"396 />397 <Tool398 Name="VCALinkTool"399 />400 <Tool401 Name="VCManifestTool"402 />403 <Tool404 Name="VCXDCMakeTool"405 />406 <Tool407 Name="VCBscMakeTool"408 />409 <Tool410 Name="VCFxCopTool"411 />412 <Tool413 Name="VCAppVerifierTool"414 />415 <Tool416 Name="VCWebDeploymentTool"417 />418 <Tool419 Name="VCPostBuildEventTool"420 CommandLine=""421 />422 </Configuration>423 <Configuration424 Name="OIS_DebugDll|x64"425 OutputDirectory="..\dll64"426 IntermediateDirectory="..\dll64\$(ConfigurationName)"427 ConfigurationType="2"428 CharacterSet="2"429 >430 <Tool431 Name="VCPreBuildEventTool"432 />433 <Tool434 Name="VCCustomBuildTool"435 />436 <Tool437 Name="VCXMLDataGeneratorTool"438 />439 <Tool440 Name="VCWebServiceProxyGeneratorTool"441 />442 <Tool443 Name="VCMIDLTool"444 TargetEnvironment="3"445 />446 <Tool447 Name="VCCLCompilerTool"448 Optimization="0"449 AdditionalIncludeDirectories="..\includes"450 PreprocessorDefinitions="WIN32;_DEBUG;_STLP_DEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"451 MinimalRebuild="true"452 BasicRuntimeChecks="3"453 RuntimeLibrary="3"454 FloatingPointModel="2"455 RuntimeTypeInfo="true"456 UsePrecompiledHeader="0"457 PrecompiledHeaderThrough="StdAfx.h"458 WarningLevel="3"459 Detect64BitPortabilityProblems="true"460 DebugInformationFormat="3"461 CallingConvention="0"462 />463 <Tool464 Name="VCManagedResourceCompilerTool"465 />466 <Tool467 Name="VCResourceCompilerTool"468 />469 <Tool470 Name="VCPreLinkEventTool"471 />472 <Tool473 Name="VCLinkerTool"474 AdditionalDependencies="dxguid.lib dinput8.lib"475 OutputFile="$(OutDir)/OIS_d.dll"476 TargetMachine="17"477 />478 <Tool479 Name="VCALinkTool"480 />481 <Tool482 Name="VCManifestTool"483 />484 <Tool485 Name="VCXDCMakeTool"486 />487 <Tool488 Name="VCBscMakeTool"489 />490 <Tool491 Name="VCFxCopTool"492 />493 <Tool494 Name="VCAppVerifierTool"495 />496 <Tool497 Name="VCWebDeploymentTool"498 />499 <Tool500 Name="VCPostBuildEventTool"501 CommandLine=""502 139 /> 503 140 </Configuration> … … 508 145 <Filter 509 146 Name="Source Files" 510 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" 147 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" 148 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" 511 149 > 512 150 <File … … 538 176 > 539 177 </File> 178 <Filter 179 Name="linux" 180 > 181 <File 182 RelativePath="..\..\src\ois\linux\EventHelpers.cpp" 183 > 184 <FileConfiguration 185 Name="Debug|Win32" 186 ExcludedFromBuild="true" 187 > 188 <Tool 189 Name="VCCLCompilerTool" 190 /> 191 </FileConfiguration> 192 <FileConfiguration 193 Name="Release|Win32" 194 ExcludedFromBuild="true" 195 > 196 <Tool 197 Name="VCCLCompilerTool" 198 /> 199 </FileConfiguration> 200 </File> 201 <File 202 RelativePath="..\..\src\ois\linux\LinuxForceFeedback.cpp" 203 > 204 <FileConfiguration 205 Name="Debug|Win32" 206 ExcludedFromBuild="true" 207 > 208 <Tool 209 Name="VCCLCompilerTool" 210 /> 211 </FileConfiguration> 212 <FileConfiguration 213 Name="Release|Win32" 214 ExcludedFromBuild="true" 215 > 216 <Tool 217 Name="VCCLCompilerTool" 218 /> 219 </FileConfiguration> 220 </File> 221 <File 222 RelativePath="..\..\src\ois\linux\LinuxInputManager.cpp" 223 > 224 <FileConfiguration 225 Name="Debug|Win32" 226 ExcludedFromBuild="true" 227 > 228 <Tool 229 Name="VCCLCompilerTool" 230 /> 231 </FileConfiguration> 232 <FileConfiguration 233 Name="Release|Win32" 234 ExcludedFromBuild="true" 235 > 236 <Tool 237 Name="VCCLCompilerTool" 238 /> 239 </FileConfiguration> 240 </File> 241 <File 242 RelativePath="..\..\src\ois\linux\LinuxJoyStickEvents.cpp" 243 > 244 <FileConfiguration 245 Name="Debug|Win32" 246 ExcludedFromBuild="true" 247 > 248 <Tool 249 Name="VCCLCompilerTool" 250 /> 251 </FileConfiguration> 252 <FileConfiguration 253 Name="Release|Win32" 254 ExcludedFromBuild="true" 255 > 256 <Tool 257 Name="VCCLCompilerTool" 258 /> 259 </FileConfiguration> 260 </File> 261 <File 262 RelativePath="..\..\src\ois\linux\LinuxKeyboard.cpp" 263 > 264 <FileConfiguration 265 Name="Debug|Win32" 266 ExcludedFromBuild="true" 267 > 268 <Tool 269 Name="VCCLCompilerTool" 270 /> 271 </FileConfiguration> 272 <FileConfiguration 273 Name="Release|Win32" 274 ExcludedFromBuild="true" 275 > 276 <Tool 277 Name="VCCLCompilerTool" 278 /> 279 </FileConfiguration> 280 </File> 281 <File 282 RelativePath="..\..\src\ois\linux\LinuxMouse.cpp" 283 > 284 <FileConfiguration 285 Name="Debug|Win32" 286 ExcludedFromBuild="true" 287 > 288 <Tool 289 Name="VCCLCompilerTool" 290 /> 291 </FileConfiguration> 292 <FileConfiguration 293 Name="Release|Win32" 294 ExcludedFromBuild="true" 295 > 296 <Tool 297 Name="VCCLCompilerTool" 298 /> 299 </FileConfiguration> 300 </File> 301 </Filter> 540 302 <Filter 541 303 Name="Win32" … … 560 322 RelativePath="..\..\src\ois\win32\Win32Mouse.cpp" 561 323 > 562 </File>563 </Filter>564 <Filter565 Name="linux"566 >567 <File568 RelativePath="..\..\src\ois\linux\EventHelpers.cpp"569 >570 <FileConfiguration571 Name="Release|Win32"572 ExcludedFromBuild="true"573 >574 <Tool575 Name="VCCLCompilerTool"576 />577 </FileConfiguration>578 <FileConfiguration579 Name="Debug|Win32"580 ExcludedFromBuild="true"581 >582 <Tool583 Name="VCCLCompilerTool"584 />585 </FileConfiguration>586 </File>587 <File588 RelativePath="..\..\src\ois\linux\LinuxForceFeedback.cpp"589 >590 <FileConfiguration591 Name="Release|Win32"592 ExcludedFromBuild="true"593 >594 <Tool595 Name="VCCLCompilerTool"596 />597 </FileConfiguration>598 <FileConfiguration599 Name="Debug|Win32"600 ExcludedFromBuild="true"601 >602 <Tool603 Name="VCCLCompilerTool"604 />605 </FileConfiguration>606 </File>607 <File608 RelativePath="..\..\src\ois\linux\LinuxInputManager.cpp"609 >610 <FileConfiguration611 Name="Release|Win32"612 ExcludedFromBuild="true"613 >614 <Tool615 Name="VCCLCompilerTool"616 />617 </FileConfiguration>618 <FileConfiguration619 Name="Debug|Win32"620 ExcludedFromBuild="true"621 >622 <Tool623 Name="VCCLCompilerTool"624 />625 </FileConfiguration>626 </File>627 <File628 RelativePath="..\..\src\ois\linux\LinuxJoyStickEvents.cpp"629 >630 <FileConfiguration631 Name="Release|Win32"632 ExcludedFromBuild="true"633 >634 <Tool635 Name="VCCLCompilerTool"636 />637 </FileConfiguration>638 <FileConfiguration639 Name="Debug|Win32"640 ExcludedFromBuild="true"641 >642 <Tool643 Name="VCCLCompilerTool"644 />645 </FileConfiguration>646 </File>647 <File648 RelativePath="..\..\src\ois\linux\LinuxKeyboard.cpp"649 >650 <FileConfiguration651 Name="Release|Win32"652 ExcludedFromBuild="true"653 >654 <Tool655 Name="VCCLCompilerTool"656 />657 </FileConfiguration>658 <FileConfiguration659 Name="Debug|Win32"660 ExcludedFromBuild="true"661 >662 <Tool663 Name="VCCLCompilerTool"664 />665 </FileConfiguration>666 </File>667 <File668 RelativePath="..\..\src\ois\linux\LinuxMouse.cpp"669 >670 <FileConfiguration671 Name="Release|Win32"672 ExcludedFromBuild="true"673 >674 <Tool675 Name="VCCLCompilerTool"676 />677 </FileConfiguration>678 <FileConfiguration679 Name="Debug|Win32"680 ExcludedFromBuild="true"681 >682 <Tool683 Name="VCCLCompilerTool"684 />685 </FileConfiguration>686 324 </File> 687 325 </Filter> … … 689 327 <Filter 690 328 Name="Header Files" 691 Filter="h;hpp;hxx;hm;inl;inc" 329 Filter="h;hpp;hxx;hm;inl;inc;xsd" 330 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" 692 331 > 693 332 <File … … 735 374 > 736 375 </File> 376 <Filter 377 Name="Interface" 378 > 379 <File 380 RelativePath="..\..\src\ois\OISEffect.h" 381 > 382 </File> 383 <File 384 RelativePath="..\..\src\ois\OISForceFeedback.h" 385 > 386 </File> 387 <File 388 RelativePath="..\..\src\ois\OISInterface.h" 389 > 390 </File> 391 </Filter> 737 392 <Filter 738 393 Name="Win32" … … 760 415 <File 761 416 RelativePath="..\..\src\ois\win32\Win32Prereqs.h" 762 >763 </File>764 </Filter>765 <Filter766 Name="Interface"767 >768 <File769 RelativePath="..\..\src\ois\OISEffect.h"770 >771 </File>772 <File773 RelativePath="..\..\src\ois\OISForceFeedback.h"774 >775 </File>776 <File777 RelativePath="..\..\src\ois\OISInterface.h"778 417 > 779 418 </File> -
code/branches/orxonox_tutorial/visual_studio/vc8/orxonox.vcproj
r1816 r1846 5 5 Name="orxonox" 6 6 ProjectGUID="{0B6C5CFD-F91B-432A-80A3-2610F61E060B}" 7 RootNamespace=" FICN"7 RootNamespace="orxonox" 8 8 Keyword="Win32Proj" 9 9 > … … 19 19 Name="Debug|Win32" 20 20 ConfigurationType="1" 21 InheritedPropertySheets=" $(SolutionDir)base_properties_debug.vsprops;..\orxonox_properties.vsprops"21 InheritedPropertySheets=".\debug.vsprops;.\orxonox.vsprops" 22 22 CharacterSet="1" 23 23 > … … 82 82 Name="Release|Win32" 83 83 ConfigurationType="1" 84 InheritedPropertySheets=" $(SolutionDir)base_properties_release.vsprops;..\orxonox_properties.vsprops"84 InheritedPropertySheets=".\release.vsprops;.\orxonox.vsprops" 85 85 CharacterSet="1" 86 86 WholeProgramOptimization="0" -
code/branches/orxonox_tutorial/visual_studio/vc8/tolua.vcproj
r1755 r1846 5 5 Name="tolua" 6 6 ProjectGUID="{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}" 7 RootNamespace=" FICN"7 RootNamespace="orxonox" 8 8 Keyword="Win32Proj" 9 9 > … … 19 19 Name="Debug|Win32" 20 20 ConfigurationType="2" 21 InheritedPropertySheets=" $(SolutionDir)base_properties_debug.vsprops;..\tolua_properties.vsprops"21 InheritedPropertySheets=".\debug.vsprops;.\tolua.vsprops" 22 22 CharacterSet="1" 23 23 > … … 80 80 Name="Release|Win32" 81 81 ConfigurationType="2" 82 InheritedPropertySheets=" $(SolutionDir)base_properties_release.vsprops;..\tolua_properties.vsprops"82 InheritedPropertySheets=".\release.vsprops;.\tolua.vsprops" 83 83 CharacterSet="1" 84 84 WholeProgramOptimization="0" -
code/branches/orxonox_tutorial/visual_studio/vc8/util.vcproj
r1821 r1846 5 5 Name="util" 6 6 ProjectGUID="{2240ECD7-2F48-4431-8E1B-25466A384CCC}" 7 RootNamespace=" FICN"7 RootNamespace="orxonox" 8 8 Keyword="Win32Proj" 9 9 > … … 19 19 Name="Debug|Win32" 20 20 ConfigurationType="2" 21 InheritedPropertySheets=" $(SolutionDir)base_properties_debug.vsprops;..\util_properties.vsprops"21 InheritedPropertySheets=".\debug.vsprops;.\util.vsprops" 22 22 CharacterSet="1" 23 23 > … … 80 80 Name="Release|Win32" 81 81 ConfigurationType="2" 82 InheritedPropertySheets=" $(SolutionDir)base_properties_release.vsprops;..\util_properties.vsprops"82 InheritedPropertySheets=".\release.vsprops;.\util.vsprops" 83 83 CharacterSet="1" 84 84 WholeProgramOptimization="0" … … 262 262 > 263 263 </File> 264 <File265 RelativePath="..\..\src\util\XMLIncludes.h"266 >267 </File>268 264 </Filter> 269 265 </Files>
Note: See TracChangeset
for help on using the changeset viewer.
