Changeset 1064

Timestamp:

Apr 14, 2008, 9:39:57 PM (17 years ago)

Author:

rgrieder

Message:

• replaced all String2Number with ConvertValue
• replaced all tokenize with SubString
• dealt with warnings under msvc
• removed some warnings by placing casts
• bugfix in audio: local variable pushed into member variable std::vector
• updated StableHeaders.h

Location:

code/trunk

Files:

• src/asylum/network/NetworkFrameListener.h (moved) (moved from code/trunk/src/network/NetworkFrameListener.h)
• src/asylum/util (added)
• src/asylum/util/String2Number.h (moved) (moved from code/trunk/src/util/String2Number.h)
• src/asylum/util/Tokenizer.h (moved) (moved from code/trunk/src/util/Tokenizer.h)
• src/audio/AudioManager.cc (modified) (6 diffs)
• src/audio/AudioManager.h (modified) (3 diffs)
• src/audio/AudioPrereqs.h (modified) (1 diff)
• src/audio/AudioStream.cc (modified) (1 diff)
• src/core/CommandExecutor.h (modified) (1 diff)
• src/core/ConfigFileManager.h (modified) (1 diff)
• src/core/CoreSettings.h (modified) (1 diff)
• src/core/Factory.h (modified) (1 diff)
• src/core/Functor.h (modified) (2 diffs)
• src/core/Identifier.h (modified) (1 diff)
• src/core/IdentifierDistributor.h (modified) (1 diff)
• src/core/Language.h (modified) (1 diff)
• src/core/OutputHandler.h (modified) (1 diff)
• src/network/ConnectionManager.cc (modified) (3 diffs)
• src/network/GameStateManager.cc (modified) (1 diff)
• src/network/PacketDecoder.cc (modified) (1 diff)
• src/orxonox/OrxonoxPlatform.h (modified) (1 diff)
• src/orxonox/OrxonoxStableHeaders.h (modified) (3 diffs)
• src/orxonox/objects/Ambient.cc (modified) (2 diffs)
• src/orxonox/objects/Camera.cc (modified) (3 diffs)
• src/orxonox/objects/Model.cc (modified) (1 diff)
• src/orxonox/objects/Skybox.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.cc (modified) (3 diffs)
• src/orxonox/objects/WorldEntity.cc (modified) (1 diff)
• src/util/Convert.h (modified) (2 diffs)
• src/util/MultiTypeMath.h (modified) (2 diffs)
• src/util/MultiTypeString.cc (modified) (1 diff)
• src/util/MultiTypeString.h (modified) (2 diffs)
• src/util/String.cc (modified) (2 diffs)
• visual_studio/orxonox_vc8.sln (modified) (3 diffs)
• visual_studio/vc8/network.vcproj (modified) (1 diff)
• visual_studio/vc8/tolua++.vcproj (modified) (1 diff)
• visual_studio/vc8/util.vcproj (modified) (1 diff)

code/trunk/src/audio/AudioManager.cc

@@ -31 +31 @@
 #include <AL/alut.h>
 
+#include "AudioBuffer.h"
+#include "AudioSource.h"
+#include "AudioStream.h"
 #include "core/Error.h"
 #include "core/Debug.h"
@@ -49 +52 @@
                 for (unsigned int i=0;i<bgSounds.size();i++)
                 {
-                        bgSounds[i].release();
+                        bgSounds[i]->release();
                 }
                 alutExit();
@@ -60 +63 @@
                 if (bgSounds.size() > 0)
                 {
-                        if(!bgSounds[currentBgSound].playback())
+                        if(!bgSounds[currentBgSound]->playback())
                         {
                 orxonox::Error("Ogg refused to play.");
@@ -80 +83 @@
         {
     std::string path = ambientPath + "/" + file + ".ogg";
-                AudioStream tmp(path);
-                tmp.open();
-                if (tmp.isLoaded())
+                AudioStream* tmp = new AudioStream(path);
+                tmp->open();
+                if (tmp->isLoaded())
                 {
                         bgSounds.push_back(tmp);
@@ -93 +96 @@
                 if (bgSounds.size() > 0)
                 {
-                        if (bgSounds[currentBgSound].isLoaded())
+                        if (bgSounds[currentBgSound]->isLoaded())
                         {
-                                bool playing = bgSounds[currentBgSound].update();
-                    if(!bgSounds[currentBgSound].playing() && playing)
+                                bool playing = bgSounds[currentBgSound]->update();
+                    if(!bgSounds[currentBgSound]->playing() && playing)
                     {
-                        if(!bgSounds[currentBgSound].playback())
+                        if(!bgSounds[currentBgSound]->playback())
                             orxonox::Error("Ogg abruptly stopped.");
                         else
@@ -117 +120 @@
           currentBgSound = ++currentBgSound % bgSounds.size();
 
-                                        if (!bgSounds[currentBgSound].isLoaded())
+                                        if (!bgSounds[currentBgSound]->isLoaded())
                                         {
-                                                bgSounds[currentBgSound].release();
-                                                bgSounds[currentBgSound].open();
+                                                bgSounds[currentBgSound]->release();
+                                                bgSounds[currentBgSound]->open();
                                         }
-                                        bgSounds[currentBgSound].playback();
+                                        bgSounds[currentBgSound]->playback();
                                         COUT(3) << "Info: Playing next background sound" << std::endl;
                                 }

code/trunk/src/audio/AudioManager.h

@@ -36 +36 @@
 
 #include "core/Tickable.h"
-#include "AudioBuffer.h"
-#include "AudioSource.h"
-#include "AudioStream.h"
 
 namespace audio
@@ -76 +73 @@
 
                 // Background sound
-    std::vector<AudioStream> bgSounds;
+    std::vector<AudioStream*> bgSounds;
                 int currentBgSound;
 
@@ -84 +81 @@
 
                 // Vector containing all audio files
-                std::vector<AudioBuffer> buffers;
+                std::vector<AudioBuffer*> buffers;
                 // Vector containing all audio sources which referer to one buffer
-                std::vector<AudioSource> sources;
+                std::vector<AudioSource*> sources;
                 // The ambient background sound
-                AudioSource ambient;
+                AudioSource* ambient;
 
                 std::vector<float> listenerPosition;

code/trunk/src/audio/AudioPrereqs.h

@@ -68 +68 @@
 }
 
+//-----------------------------------------------------------------------
+// Warnings
+//-----------------------------------------------------------------------
+// set to 4: conversion from 'ogg_int64_t' to 'long', possible loss of data
+# pragma warning (4 : 4244)
+
+
 #endif /* _AudioPrereqs_H__ */

code/trunk/src/audio/AudioStream.cc

@@ -43 +43 @@
             int result;
 
-
-            if(!(oggFile = fopen(path.c_str(), "rb")))
+      oggFile = fopen(path.c_str(), "rb");
+            if(!oggFile)
                         {
                 orxonox::Error("Could not open Ogg file "+path);

code/trunk/src/core/CommandExecutor.h

@@ -161 +161 @@
         private:
             CommandExecutor() {}
-            CommandExecutor(const CommandExecutor& other) {}
+            CommandExecutor(const CommandExecutor& other);
             ~CommandExecutor() {}
 

code/trunk/src/core/ConfigFileManager.h

@@ -286 +286 @@
         private:
             ConfigFileManager();
-            ConfigFileManager(const ConfigFileManager& other) {}
+            ConfigFileManager(const ConfigFileManager& other);
             ~ConfigFileManager();
 

code/trunk/src/core/CoreSettings.h

@@ -61 +61 @@
 
             CoreSettings();
-            CoreSettings(const CoreSettings& other) {}
+            CoreSettings(const CoreSettings& other);
             virtual ~CoreSettings();
 

code/trunk/src/core/Factory.h

@@ -71 +71 @@
         private:
             Factory() {}                            // don't create
-            Factory(const Factory& factory) {}      // don't copy
+            Factory(const Factory& factory);        // don't copy
             ~Factory() {}                           // don't delete
 

code/trunk/src/core/Functor.h

@@ -429 +429 @@
 
 
-
+// disable annoying warning about forcing value to boolean
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(push)
+#pragma warning(disable:4100 4800)
+#endif
 
 #define CREATE_ALL_STATIC_FUNCTORS() \
@@ -465 +469 @@
 }
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _Functor_H__ */

code/trunk/src/core/Identifier.h

@@ -225 +225 @@
         private:
             Identifier();
-            Identifier(const Identifier& identifier) {} // don't copy
+            Identifier(const Identifier& identifier); // don't copy
             virtual ~Identifier();
             void initialize(std::set<const Identifier*>* parents);

code/trunk/src/core/IdentifierDistributor.h

@@ -53 +53 @@
         private:
             IdentifierDistributor() {};                                         // Don't create
-            IdentifierDistributor(const IdentifierDistributor& distributor) {}  // Don't copy
+            IdentifierDistributor(const IdentifierDistributor& distributor);    // Don't copy
             ~IdentifierDistributor() {}                                         // Don't delete
 

code/trunk/src/core/Language.h

@@ -123 +123 @@
         private:
             Language();
-            Language(const Language& language) {}   // don't copy
+            Language(const Language& language);     // don't copy
             virtual ~Language() {};                 // don't delete
 

code/trunk/src/core/OutputHandler.h

@@ -114 +114 @@
         private:
             explicit OutputHandler(const std::string& logfilename);
-            OutputHandler(const OutputHandler& oh) {}; // don't copy
+            OutputHandler(const OutputHandler& oh);  // don't copy
             virtual ~OutputHandler();
             std::ofstream logfile_;     //!< The logfile where the output is logged

code/trunk/src/network/ConnectionManager.cc

@@ -114 +114 @@
 
   bool ConnectionManager::addPacket(ENetPacket *packet, ENetPeer *peer) {
-    if(enet_peer_send(peer, head_->findClient(&(peer->address))->getID() , packet)!=0)
+    if(enet_peer_send(peer, (enet_uint8)head_->findClient(&(peer->address))->getID() , packet)!=0)
       return false;
     return true;
@@ -120 +120 @@
 
   bool ConnectionManager::addPacket(ENetPacket *packet, int clientID) {
-    if(enet_peer_send(head_->findClient(clientID)->getPeer(), clientID, packet)!=0)
+    if(enet_peer_send(head_->findClient(clientID)->getPeer(), (enet_uint8)clientID, packet)!=0)
       return false;
     return true;
@@ -127 +127 @@
   bool ConnectionManager::addPacketAll(ENetPacket *packet) {
     for(ClientInformation *i=head_->next(); i!=0; i=i->next()){
-      if(enet_peer_send(i->getPeer(), i->getID(), packet)!=0)
+      if(enet_peer_send(i->getPeer(), (enet_uint8)i->getID(), packet)!=0)
         return false;
     }

code/trunk/src/network/GameStateManager.cc

@@ -133 +133 @@
       // run Synchronisable::getData with offset and additional place for 3 ints in between (for ids and length)
       sync=it->getData((retval->data)+offset+3*sizeof(int));
-      *(retval->data+offset)=sync.length;
-      *(retval->data+offset+sizeof(int))=sync.objectID;
-      *(retval->data+offset+2*sizeof(int))=sync.classID;
+      *(retval->data+offset)=(unsigned char)sync.length;
+      *(retval->data+offset+sizeof(int))=(unsigned char)sync.objectID;
+      *(retval->data+offset+2*sizeof(int))=(unsigned char)sync.classID;
       // increase data pointer
       offset+=tempsize+3*sizeof(int);

code/trunk/src/network/PacketDecoder.cc

@@ -153 +153 @@
     }
     //since it's not alowed to use void* for pointer arithmetic
+    //FIXME: variable never used
     unsigned char* data = (unsigned char *)(packet->data);
     //copy the GameStateCompressed id into the struct, which is located at second place data+sizeof( int )

code/trunk/src/orxonox/OrxonoxPlatform.h

@@ -226 +226 @@
 //#   pragma warning (disable : 4305)
 
-// disable: "<type> needs to have dll-interface to be used by clients'
+// set to level 4: "<type> needs to have dll-interface to be used by clients'
 // Happens on STL member variables which are not public therefore is ok
-// This has been dealt with in base_properties of the solution since the
-// warning primarily occurs in library header files (which are mostly
-// included before OrxonoxPlatform.h is)
-//#   pragma warning (disable : 4251)
+#   pragma warning (disable : 4251)
 
 // disable: 'MultiTypeString' : multiple assignment operators specified

code/trunk/src/orxonox/OrxonoxStableHeaders.h

@@ -55 +55 @@
 #include <OgreFrameListener.h>
 #include <OgreLight.h>
+#include <OgreLog.h>
+#include <OgreLogManager.h>
 #include <OgreMath.h>
 #include <OgreMatrix3.h>
@@ -62 +64 @@
 #include <OgreParticleEmitter.h>
 #include <OgreParticleSystem.h>
-#include <OgrePlatform.h>
-#include <OgrePrerequisites.h>
 #include <OgreQuaternion.h>
 #include <OgreResourceGroupManager.h>
@@ -81 +81 @@
 #include <OIS/OIS.h>
 
-/**
-* Some of the not so stable header files.
-* It's not very useful to include them anyway..
-**/
+//-----------------------------------------------------------------------
+// ORXONOX HEADERS
+//-----------------------------------------------------------------------
 
-#include "core/CoreIncludes.h"
-#include "core/BaseObject.h"
-#include "core/Tickable.h"
-#include "core/Error.h"
-#include "core/Loader.h"
-#include "core/XMLPort.h"
-
-#include "network/Synchronisable.h"
-//#include "network/Server.h"
-//#include "network/Client.h"
-
+#include "util/Convert.h"
 #include "util/Math.h"
-#include "util/Sleep.h"
-#include "util/String2Number.h"
-#include "util/Tokenizer.h"
 #include "util/Multitype.h"
 #include "util/MultiTypeMath.h"
 #include "util/MultiTypePrimitive.h"
 #include "util/MultiTypeString.h"
-#include "util/substring.h"
+#include "util/Sleep.h"
+#include "util/String.h"
+#include "util/SubString.h"
 #include "util/XMLIncludes.h"
-
 #include "util/tinyxml/ticpp.h"
 #include "util/tinyxml/tinyxml.h"
 
+#include "core/BaseObject.h"
+#include "core/CommandExecutor.h"
+#include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
+#include "core/Debug.h"
+#include "core/Executor.h"
+#include "core/Tickable.h"
+#include "core/XMLPort.h"
+
+#include "network/Synchronisable.h"
+
+#include "OrxonoxPlatform.h"
+#include "OrxonoxPrereqs.h"
+#include "tools/Timer.h"
 #include "objects/Model.h"
 #include "objects/WorldEntity.h"

code/trunk/src/orxonox/objects/Ambient.cc

@@ -36 +36 @@
 
 #include "util/tinyxml/tinyxml.h"
-#include "util/Tokenizer.h"
-#include "util/String2Number.h"
+#include "util/SubString.h"
+#include "util/Convert.h"
 #include "util/Math.h"
 #include "core/Debug.h"
@@ -67 +67 @@
         if (xmlElem->Attribute("colourvalue"))
         {
+        SubString colourvalues(xmlElem->Attribute("colourvalue"), ',');
 
-                std::vector<std::string> colourvalues = tokenize(xmlElem->Attribute("colourvalue"),",");
                 float r, g, b;
-                String2Number<float>(r, colourvalues[0]);
-                String2Number<float>(g, colourvalues[1]);
-                String2Number<float>(b, colourvalues[2]);
+        convertValue<std::string, float>(&r, colourvalues[0]);
+        convertValue<std::string, float>(&g, colourvalues[1]);
+        convertValue<std::string, float>(&b, colourvalues[2]);
 
                 this->setAmbientLight(ColourValue(r, g, b));

code/trunk/src/orxonox/objects/Camera.cc

@@ -38 +38 @@
 
 #include "util/tinyxml/tinyxml.h"
-#include "util/Tokenizer.h"
-#include "util/String2Number.h"
+#include "util/Substring.h"
+#include "util/Convert.h"
 #include "util/Math.h"
 #include "core/Debug.h"
@@ -73 +73 @@
 
         float x, y, z;
-        std::vector<std::string> posVec = tokenize(xmlElem->Attribute("pos"),",");
-        String2Number<float>(x, posVec[0]);
-        String2Number<float>(y, posVec[1]);
-        String2Number<float>(z, posVec[2]);
+        SubString posVec(xmlElem->Attribute("pos"), ',');
+        convertValue<std::string, float>(&x, posVec[0]);
+        convertValue<std::string, float>(&y, posVec[1]);
+        convertValue<std::string, float>(&z, posVec[2]);
 
         cam->setPosition(Vector3(x,y,z));
 
-        posVec = tokenize(xmlElem->Attribute("lookat"),",");
-        String2Number<float>(x, posVec[0]);
-        String2Number<float>(y, posVec[1]);
-        String2Number<float>(z, posVec[2]);
+        posVec = SubString(xmlElem->Attribute("lookat"), ',');
+        convertValue<std::string, float>(&x, posVec[0]);
+        convertValue<std::string, float>(&y, posVec[1]);
+        convertValue<std::string, float>(&z, posVec[2]);
 
         cam->lookAt(Vector3(x,y,z));
@@ -93 +93 @@
 
         // FIXME: unused var
-        Ogre::Viewport* vp = GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
+        //Ogre::Viewport* vp = 
+        GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
 
 

code/trunk/src/orxonox/objects/Model.cc

@@ -31 +31 @@
 
 #include "util/tinyxml/tinyxml.h"
-#include "util/Tokenizer.h"
-#include "util/String2Number.h"
 #include "core/CoreIncludes.h"
 #include "GraphicsEngine.h"

code/trunk/src/orxonox/objects/Skybox.cc

@@ -35 +35 @@
 
 #include "util/tinyxml/tinyxml.h"
-//#include "util/Tokenizer.h"
-//#include "util/String2Number.h"
 #include "GraphicsEngine.h"
 #include "core/CoreIncludes.h"

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -39 +39 @@
 
 #include "util/tinyxml/tinyxml.h"
-#include "util/String2Number.h"
+#include "util/Convert.h"
 #include "util/Math.h"
 #include "core/CoreIncludes.h"
@@ -259 +259 @@
             std::string rdStr = xmlElem->Attribute("rotDamp");
 
-            String2Number<float>(this->maxSpeed_, msStr);
-            String2Number<float>(this->maxSideAndBackSpeed_, msabsStr);
-            String2Number<float>(this->maxRotation_, mrStr);
-            String2Number<float>(this->translationAcceleration_, taStr);
-            String2Number<float>(this->rotationAcceleration_, raStr);
-            String2Number<float>(this->translationDamping_, tdStr);
-            String2Number<float>(this->rotationDamping_, rdStr);
+            convertValue<std::string, float>(&this->maxSpeed_, msStr);
+            convertValue<std::string, float>(&this->maxSideAndBackSpeed_, msabsStr);
+            convertValue<std::string, float>(&this->maxRotation_, mrStr);
+            convertValue<std::string, float>(&this->translationAcceleration_, taStr);
+            convertValue<std::string, float>(&this->rotationAcceleration_, raStr);
+            convertValue<std::string, float>(&this->translationDamping_, tdStr);
+            convertValue<std::string, float>(&this->rotationDamping_, rdStr);
 
             this->maxRotationRadian_ = Radian(this->maxRotation_);
@@ -458 +458 @@
 
         OIS::Keyboard* mKeyboard = InputManager::getSingleton().getKeyboard();
-        OIS::Mouse* mMouse = InputManager::getSingleton().getMouse();
+        //FIXME: variable never used
+        //OIS::Mouse* mMouse = InputManager::getSingleton().getMouse();
 
 

code/trunk/src/orxonox/objects/WorldEntity.cc

@@ -34 +34 @@
 
 #include "util/tinyxml/tinyxml.h"
-#include "util/Tokenizer.h"
-#include "util/String2Number.h"
+#include "util/SubString.h"
 #include "core/CoreIncludes.h"
 #include "GraphicsEngine.h"

code/trunk/src/util/Convert.h

@@ -43 +43 @@
 #include "SubString.h"
 #include "MultiTypeMath.h"
+
+// disable annoying warning about forcing value to boolean
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(push)
+#pragma warning(disable:4100 4800)
+#endif
 
 
@@ -620 +626 @@
 };
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _Convert_H__ */

code/trunk/src/util/MultiTypeMath.h

@@ -35 +35 @@
 #include "MultiTypeString.h"
 #include "Math.h"
+
+// disable annoying warning about multiple assignment operators
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(push)
+#pragma warning(disable:4522)
+#endif
 
 class _UtilExport MultiTypeMath : public MultiTypeString
@@ -160 +166 @@
 _UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm);
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _MultiTypeMath_H__ */

code/trunk/src/util/MultiTypeString.cc

@@ -120 +120 @@
         return MultiTypePrimitive::toString();
 
-    return output;
+    // FIXME: unreachable code
+    // return output;
 }
 

code/trunk/src/util/MultiTypeString.h

@@ -37 +37 @@
 
 #include "MultiTypePrimitive.h"
+
+// disable annoying warning about multiple assignment operators
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(push)
+#pragma warning(disable:4522)
+#endif
 
 class _UtilExport MultiTypeString : public MultiTypePrimitive
@@ -117 +123 @@
 _UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeString& mts);
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _MultiTypeString_H__ */

code/trunk/src/util/String.cc

@@ -308 +308 @@
     for (unsigned int i = 0; i < str->size(); ++i)
     {
-        (*str)[i] = tolower((*str)[i]);
+        (*str)[i] = (char)tolower((*str)[i]);
     }
 }
@@ -332 +332 @@
     for (unsigned int i = 0; i < str->size(); ++i)
     {
-        (*str)[i] = toupper((*str)[i]);
+        (*str)[i] = (char)toupper((*str)[i]);
     }
 }

code/trunk/visual_studio/orxonox_vc8.sln

@@ -38 +38 @@
         EndProjectSection
         ProjectSection(ProjectDependencies) = postProject
+                {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
+                {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
                 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}
-                {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
                 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
-                {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
         EndProjectSection
 EndProject
@@ -67 +67 @@
                 Debug|Win32 = Debug|Win32
                 Release|Win32 = Release|Win32
+                static_libs_debug|Win32 = static_libs_debug|Win32
+                static_libs_release|Win32 = static_libs_release|Win32
         EndGlobalSection
         GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -73 +75 @@
                 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.ActiveCfg = Release|Win32
                 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.Build.0 = Release|Win32
+                {4733BD1A-E04C-458D-8BFB-5010250EA497}.static_libs_debug|Win32.ActiveCfg = Release|Win32
+                {4733BD1A-E04C-458D-8BFB-5010250EA497}.static_libs_release|Win32.ActiveCfg = Release|Win32
                 {271715F3-5B90-4110-A552-70C788084A86}.Debug|Win32.ActiveCfg = Debug|Win32
                 {271715F3-5B90-4110-A552-70C788084A86}.Debug|Win32.Build.0 = Debug|Win32
                 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.ActiveCfg = Release|Win32
                 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.Build.0 = Release|Win32
+                {271715F3-5B90-4110-A552-70C788084A86}.static_libs_debug|Win32.ActiveCfg = Release|Win32
+                {271715F3-5B90-4110-A552-70C788084A86}.static_libs_release|Win32.ActiveCfg = Release|Win32
                 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.ActiveCfg = Debug|Win32
                 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.Build.0 = Debug|Win32
                 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Release|Win32.ActiveCfg = Release|Win32
                 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Release|Win32.Build.0 = Release|Win32
+                {35575B59-E1AE-40E8-89C4-2862B5B09B68}.static_libs_debug|Win32.ActiveCfg = Release|Win32
+                {35575B59-E1AE-40E8-89C4-2862B5B09B68}.static_libs_release|Win32.ActiveCfg = Release|Win32
                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.ActiveCfg = Debug|Win32
                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.Build.0 = Debug|Win32
                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32
                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32
+                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.static_libs_debug|Win32.ActiveCfg = Release|Win32
+                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.static_libs_release|Win32.ActiveCfg = Release|Win32
                 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.Debug|Win32.ActiveCfg = Debug|Win32
                 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.Debug|Win32.Build.0 = Debug|Win32
                 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.Release|Win32.ActiveCfg = Release|Win32
                 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.Release|Win32.Build.0 = Release|Win32
+                {2240ECD7-2F48-4431-8E1B-25466A384CCC}.static_libs_debug|Win32.ActiveCfg = Release|Win32
+                {2240ECD7-2F48-4431-8E1B-25466A384CCC}.static_libs_release|Win32.ActiveCfg = Release|Win32
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Debug|Win32.ActiveCfg = Debug|Win32
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Release|Win32.ActiveCfg = Release|Win32
+                {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_debug|Win32.ActiveCfg = Debug|Win32
+                {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_debug|Win32.Build.0 = Debug|Win32
+                {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_release|Win32.ActiveCfg = Release|Win32
+                {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_release|Win32.Build.0 = Release|Win32
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Debug|Win32.ActiveCfg = Debug|Win32
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Release|Win32.ActiveCfg = Release|Win32
+                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.static_libs_debug|Win32.ActiveCfg = Debug|Win32
+                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.static_libs_debug|Win32.Build.0 = Debug|Win32
+                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.static_libs_release|Win32.ActiveCfg = Release|Win32
+                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.static_libs_release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

code/trunk/visual_studio/vc8/network.vcproj

@@ -323 +323 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\network\NetworkFrameListener.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\network\NetworkPrereqs.h"
                                 >

code/trunk/visual_studio/vc8/tolua++.vcproj

@@ -71 +71 @@
                         Name="Release|Win32"
                         ConfigurationType="4"
-                        InheritedPropertySheets="$(SolutionDir)base_properties_release.vsprops;..\tixml_properties.vsprops"
+                        InheritedPropertySheets="$(SolutionDir)base_properties_release.vsprops;..\tolua++_properties.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"

code/trunk/visual_studio/vc8/util.vcproj

@@ -227 +227 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\util\String2Number.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\util\SubString.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\util\Tokenizer.h"
                                 >
                         </File>