Changeset 2249 for code/branches/buildsystem

Timestamp:

Nov 22, 2008, 10:31:32 PM (16 years ago)

Author:

rgrieder

Message:

Changes in visual studio solution:

• Restored directories.vsprops
• Removed second tolua application and adjusted tolua file generation to the new method.
• Added files in bin/msvc directory for debug and release versions
• Added TIXML_USE_TICPP and _CRT_SECURE_NO_WARNINGS to the global symbols.

Location:

code/branches/buildsystem

Files:

• bin/msvc/debug (added)
• bin/msvc/debug/orxonox_d.ini (added)
• bin/msvc/release (added)
• bin/msvc/release/orxonox.ini (added)
• visual_studio/vc8/base.vsprops (modified) (1 diff)
• visual_studio/vc8/core.vcproj (modified) (4 diffs)
• visual_studio/vc8/directories.vsprops (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (7 diffs)
• visual_studio/vc8/orxonox_vc8.sln (modified) (5 diffs)
• visual_studio/vc8/toluaexe.vcproj (moved) (moved from code/branches/buildsystem/visual_studio/vc8/toluagen_orxonox.vcproj) (5 diffs)
• visual_studio/vc8/toluaexe.vsprops (moved) (moved from code/branches/buildsystem/visual_studio/vc8/toluagen_orxonox.vsprops) (1 diff)
• visual_studio/vc8/toluagen.vcproj (deleted)
• visual_studio/vc8/toluagen.vsprops (deleted)

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

@@ -9 +9 @@
                 Name="VCCLCompilerTool"
                 AdditionalIncludeDirectories=""$(RootDir)src";"$(RootDir)src\tolua";"$(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""
-                PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI;LUA_BUILD_AS_DLL"
+                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"
                 WarningLevel="3"
                 DisableSpecificWarnings="4522;4251;4800"

code/branches/buildsystem/visual_studio/vc8/core.vcproj

@@ -161 +161 @@
                                                 Name="VCCustomBuildTool"
                                                 Description="Generating tolua bind files..."
-                                                CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\src\core
echo $cfile "CommandExecutor.h" > tolua.pkg
echo $cfile "Script.h" >> tolua.pkg
"$(OutDir)\toluagen$(CS).exe" -n Core -o tolua_bind.cc -H tolua_bind.h tolua.pkg
"
+                                                CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "CommandExecutor.h" > $(RootDir)\src\core\tolua.pkg
echo $cfile "Script.h" >> $(RootDir)\src\core\tolua.pkg
$(OutDir)\toluaexe$(CS).exe -n Core -w $(RootDir)\src\core\ -s $(RootDir)\src\tolua\all.lua -o ToluaBindCore.cc -H ToluaBindCore.h tolua.pkg
"
                                                 AdditionalDependencies="$(RootDir)\src\core\Script.h;$(RootDir)\src\core\CommandExecutor.h"
-                                                Outputs="$(RootDir)\src\core\tolua_bind.cc; $(RootDir)\src\core\tolua_bind.h"
+                                                Outputs="$(RootDir)\src\core\ToluaBindCore.cc; $(RootDir)\src\core\ToluaBindCore.h"
                                         />
                                 </FileConfiguration>
@@ -172 +172 @@
                                                 Name="VCCustomBuildTool"
                                                 Description="Generating tolua bind files..."
-                                                CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%&#x0D;&#x0A;cd $(RootDir)\src\core&#x0D;&#x0A;echo $cfile &quot;CommandExecutor.h&quot; &gt; tolua.pkg&#x0D;&#x0A;echo $cfile &quot;Script.h&quot; &gt;&gt; tolua.pkg&#x0D;&#x0A;&quot;$(OutDir)\toluagen$(CS).exe&quot; -n Core -o tolua_bind.cc -H tolua_bind.h tolua.pkg&#x0D;&#x0A;"
+                                                CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%&#x0D;&#x0A;cd $(RootDir)\bin&#x0D;&#x0A;echo $cfile &quot;CommandExecutor.h&quot; &gt; $(RootDir)\src\core\tolua.pkg&#x0D;&#x0A;echo $cfile &quot;Script.h&quot; &gt;&gt; $(RootDir)\src\core\tolua.pkg&#x0D;&#x0A;$(OutDir)\toluaexe$(CS).exe -n Core -w $(RootDir)\src\core\ -s $(RootDir)\src\tolua\all.lua -o ToluaBindCore.cc -H ToluaBindCore.h tolua.pkg&#x0D;&#x0A;"
                                                 AdditionalDependencies="$(RootDir)\src\core\Script.h;$(RootDir)\src\core\CommandExecutor.h"
-                                                Outputs="$(RootDir)\src\core\tolua_bind.cc; $(RootDir)\src\core\tolua_bind.h"
+                                                Outputs="$(RootDir)\src\core\ToluaBindCore.cc; $(RootDir)\src\core\ToluaBindCore.h"
                                         />
                                 </FileConfiguration>
@@ -211 +211 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\tolua_bind.cc"
+                                RelativePath="..\..\src\core\ToluaBindCore.cc"
                                 >
                         </File>
@@ -417 +417 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\core\ToluaBindCore.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\core\XMLIncludes.h"
                                 >

code/branches/buildsystem/visual_studio/vc8/directories.vsprops

@@ -13 +13 @@
         <UserMacro
                 Name="LibDir"
-                Value="$(RootDir)\..\lib_dist\vc8\dependencies\$(SolutionName)\"
+                Value="$(RootDir)\dependencies\$(SolutionName)\"
         />
 </VisualStudioPropertySheet>

code/branches/buildsystem/visual_studio/vc8/orxonox.vcproj

@@ -77 +77 @@
                         <Tool
                                 Name="VCPostBuildEventTool"
+                                Description="Copying files from init folder..."
+                                CommandLine="for %%a in ($(RootDir)\bin\msvc\$(ConfigurationName)\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;rem for %%a in ($(RootDir)\init\common\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;"
                         />
                 </Configuration>
@@ -141 +143 @@
                         <Tool
                                 Name="VCPostBuildEventTool"
+                                Description="Copying files from init folder..."
+                                CommandLine="for %%a in ($(RootDir)\bin\msvc\$(ConfigurationName)\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;rem for %%a in ($(RootDir)\init\common\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;"
                         />
                 </Configuration>
@@ -161 +165 @@
                                                 Name="VCCustomBuildTool"
                                                 Description="Generating tolua bind files..."
-                                                CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%&#x0D;&#x0A;cd $(RootDir)\src\orxonox&#x0D;&#x0A;echo /**/ &gt; tolua.pkg&#x0D;&#x0A;&quot;$(OutDir)\toluagen$(CS).exe&quot; -n Orxonox -o tolua_bind.cc -H tolua_bind.h tolua.pkg&#x0D;&#x0A;"
-                                                Outputs="$(RootDir)\src\orxonox\tolua_bind.cc; $(RootDir)\src\orxonox\tolua_bind.h"
+                                                CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%&#x0D;&#x0A;cd $(RootDir)\bin&#x0D;&#x0A;echo $cfile &quot;gui/GUIManager.h&quot; &gt; $(RootDir)\src\orxonox\tolua.pkg&#x0D;&#x0A;&quot;$(OutDir)\toluaexe$(CS).exe&quot; -n Orxonox -w $(RootDir)\src\orxonox\ -s $(RootDir)\src\tolua\all.lua -o ToluaBindOrxonox.cc -H ToluaBindOrxonox.h tolua.pkg&#x0D;&#x0A;"
+                                                AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h"
+                                                Outputs="$(RootDir)\src\orxonox\ToluaBindOrxonox.cc; $(RootDir)\src\orxonox\ToluaBindOrxonox.h"
                                         />
                                 </FileConfiguration>
@@ -171 +176 @@
                                                 Name="VCCustomBuildTool"
                                                 Description="Generating tolua bind files..."
-                                                CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%&#x0D;&#x0A;cd $(RootDir)\src\orxonox&#x0D;&#x0A;echo /**/ &gt; tolua.pkg&#x0D;&#x0A;&quot;$(OutDir)\toluagen$(CS).exe&quot; -n Orxonox -o tolua_bind.cc -H tolua_bind.h tolua.pkg&#x0D;&#x0A;"
-                                                Outputs="$(RootDir)\src\orxonox\tolua_bind.cc; $(RootDir)\src\orxonox\tolua_bind.h"
+                                                CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%&#x0D;&#x0A;cd $(RootDir)\bin&#x0D;&#x0A;echo $cfile &quot;gui/GUIManager.h&quot; &gt; $(RootDir)\src\orxonox\tolua.pkg&#x0D;&#x0A;&quot;$(OutDir)\toluaexe$(CS).exe&quot; -n Orxonox -w $(RootDir)\src\orxonox\ -s $(RootDir)\src\tolua\all.lua -o ToluaBindOrxonox.cc -H ToluaBindOrxonox.h tolua.pkg&#x0D;&#x0A;"
+                                                AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h"
+                                                Outputs="$(RootDir)\src\orxonox\ToluaBindOrxonox.cc; $(RootDir)\src\orxonox\ToluaBindOrxonox.h"
                                         />
                                 </FileConfiguration>
@@ -213 +219 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\orxonox\tolua_bind.cc"
+                                RelativePath="..\..\src\orxonox\ToluaBindOrxonox.cc"
                                 >
                                 <FileConfiguration
@@ -555 +561 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\orxonox\OrxonoxLibraryHeaders.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\orxonox\OrxonoxPrereqs.h"
                                 >
@@ -576 +578 @@
                         <File
                                 RelativePath="..\..\src\orxonox\tolua_bind.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\ToluaBindOrxonox.h"
                                 >
                         </File>

code/branches/buildsystem/visual_studio/vc8/orxonox_vc8.sln

@@ -8 +8 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen", "toluagen.vcproj", "{71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}"
-        ProjectSection(ProjectDependencies) = postProject
-                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
-                {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
-        EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen_orxonox", "toluagen_orxonox.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluaexe", "toluaexe.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}"
         ProjectSection(ProjectDependencies) = postProject
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
@@ -23 +17 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}"
         ProjectSection(ProjectDependencies) = postProject
+                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
                 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
-                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
                 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}
                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
@@ -49 +43 @@
                 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}
                 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
+                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}
                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
                 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
-                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}
         EndProjectSection
 EndProject
@@ -82 +76 @@
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Release|Win32.ActiveCfg = Release|Win32
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Release|Win32.Build.0 = Release|Win32
-                {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Debug|Win32.ActiveCfg = Debug|Win32
-                {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Debug|Win32.Build.0 = Debug|Win32
-                {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Release|Win32.ActiveCfg = Release|Win32
-                {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Release|Win32.Build.0 = Release|Win32
                 {A0724246-CB7C-420B-BCF0-68EF205AFE34}.Debug|Win32.ActiveCfg = Debug|Win32
                 {A0724246-CB7C-420B-BCF0-68EF205AFE34}.Debug|Win32.Build.0 = Debug|Win32
@@ -125 +115 @@
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
-                {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
                 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
                 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}

code/branches/buildsystem/visual_studio/vc8/toluaexe.vcproj

@@ -3 +3 @@
         ProjectType="Visual C++"
         Version="8.00"
-        Name="toluagen_orxonox"
+        Name="toluaexe"
         ProjectGUID="{A0724246-CB7C-420B-BCF0-68EF205AFE34}"
         RootNamespace="orxonox"
@@ -19 +19 @@
                         Name="Debug|Win32"
                         ConfigurationType="1"
-                        InheritedPropertySheets=".\debug.vsprops;.\toluagen_orxonox.vsprops"
+                        InheritedPropertySheets=".\debug.vsprops;.\toluaexe.vsprops"
                         CharacterSet="1"
                         >
@@ -80 +80 @@
                         Name="Release|Win32"
                         ConfigurationType="1"
-                        InheritedPropertySheets=".\release.vsprops;.\toluagen_orxonox.vsprops"
+                        InheritedPropertySheets=".\release.vsprops;.\toluaexe.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="0"
@@ -152 +152 @@
                                 >
                         </File>
-                        <File
-                                RelativePath="..\..\src\tolua\toluabind.c"
-                                >
-                        </File>
                 </Filter>
                 <Filter
@@ -162 +158 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                         >
-                        <File
-                                RelativePath="..\..\src\tolua\tolua++.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\tolua\toluabind.h"
-                                >
-                        </File>
                 </Filter>
         </Files>

code/branches/buildsystem/visual_studio/vc8/toluaexe.vsprops

@@ -3 +3 @@
         ProjectType="Visual C++"
         Version="8.00"
-        Name="toluagen_orxonox"
+        Name="toluaexe"
         InheritedPropertySheets=".\directories.vsprops"
         >