Changeset 1064
- Timestamp:
- Apr 14, 2008, 9:39:57 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 1 added
- 33 edited
- 3 moved
-
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)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/audio/AudioManager.cc
r1056 r1064 31 31 #include <AL/alut.h> 32 32 33 #include "AudioBuffer.h" 34 #include "AudioSource.h" 35 #include "AudioStream.h" 33 36 #include "core/Error.h" 34 37 #include "core/Debug.h" … … 49 52 for (unsigned int i=0;i<bgSounds.size();i++) 50 53 { 51 bgSounds[i] .release();54 bgSounds[i]->release(); 52 55 } 53 56 alutExit(); … … 60 63 if (bgSounds.size() > 0) 61 64 { 62 if(!bgSounds[currentBgSound] .playback())65 if(!bgSounds[currentBgSound]->playback()) 63 66 { 64 67 orxonox::Error("Ogg refused to play."); … … 80 83 { 81 84 std::string path = ambientPath + "/" + file + ".ogg"; 82 AudioStream tmp(path);83 tmp .open();84 if (tmp .isLoaded())85 AudioStream* tmp = new AudioStream(path); 86 tmp->open(); 87 if (tmp->isLoaded()) 85 88 { 86 89 bgSounds.push_back(tmp); … … 93 96 if (bgSounds.size() > 0) 94 97 { 95 if (bgSounds[currentBgSound] .isLoaded())98 if (bgSounds[currentBgSound]->isLoaded()) 96 99 { 97 bool playing = bgSounds[currentBgSound] .update();98 if(!bgSounds[currentBgSound] .playing() && playing)100 bool playing = bgSounds[currentBgSound]->update(); 101 if(!bgSounds[currentBgSound]->playing() && playing) 99 102 { 100 if(!bgSounds[currentBgSound] .playback())103 if(!bgSounds[currentBgSound]->playback()) 101 104 orxonox::Error("Ogg abruptly stopped."); 102 105 else … … 117 120 currentBgSound = ++currentBgSound % bgSounds.size(); 118 121 119 if (!bgSounds[currentBgSound] .isLoaded())122 if (!bgSounds[currentBgSound]->isLoaded()) 120 123 { 121 bgSounds[currentBgSound] .release();122 bgSounds[currentBgSound] .open();124 bgSounds[currentBgSound]->release(); 125 bgSounds[currentBgSound]->open(); 123 126 } 124 bgSounds[currentBgSound] .playback();127 bgSounds[currentBgSound]->playback(); 125 128 COUT(3) << "Info: Playing next background sound" << std::endl; 126 129 } -
code/trunk/src/audio/AudioManager.h
r1056 r1064 36 36 37 37 #include "core/Tickable.h" 38 #include "AudioBuffer.h"39 #include "AudioSource.h"40 #include "AudioStream.h"41 38 42 39 namespace audio … … 76 73 77 74 // Background sound 78 std::vector<AudioStream > bgSounds;75 std::vector<AudioStream*> bgSounds; 79 76 int currentBgSound; 80 77 … … 84 81 85 82 // Vector containing all audio files 86 std::vector<AudioBuffer > buffers;83 std::vector<AudioBuffer*> buffers; 87 84 // Vector containing all audio sources which referer to one buffer 88 std::vector<AudioSource > sources;85 std::vector<AudioSource*> sources; 89 86 // The ambient background sound 90 AudioSource ambient;87 AudioSource* ambient; 91 88 92 89 std::vector<float> listenerPosition; -
code/trunk/src/audio/AudioPrereqs.h
r1062 r1064 68 68 } 69 69 70 //----------------------------------------------------------------------- 71 // Warnings 72 //----------------------------------------------------------------------- 73 // set to 4: conversion from 'ogg_int64_t' to 'long', possible loss of data 74 # pragma warning (4 : 4244) 75 76 70 77 #endif /* _AudioPrereqs_H__ */ -
code/trunk/src/audio/AudioStream.cc
r1056 r1064 43 43 int result; 44 44 45 46 if(! (oggFile = fopen(path.c_str(), "rb")))45 oggFile = fopen(path.c_str(), "rb"); 46 if(!oggFile) 47 47 { 48 48 orxonox::Error("Could not open Ogg file "+path); -
code/trunk/src/core/CommandExecutor.h
r1062 r1064 161 161 private: 162 162 CommandExecutor() {} 163 CommandExecutor(const CommandExecutor& other) {}163 CommandExecutor(const CommandExecutor& other); 164 164 ~CommandExecutor() {} 165 165 -
code/trunk/src/core/ConfigFileManager.h
r1062 r1064 286 286 private: 287 287 ConfigFileManager(); 288 ConfigFileManager(const ConfigFileManager& other) {}288 ConfigFileManager(const ConfigFileManager& other); 289 289 ~ConfigFileManager(); 290 290 -
code/trunk/src/core/CoreSettings.h
r1062 r1064 61 61 62 62 CoreSettings(); 63 CoreSettings(const CoreSettings& other) {}63 CoreSettings(const CoreSettings& other); 64 64 virtual ~CoreSettings(); 65 65 -
code/trunk/src/core/Factory.h
r1062 r1064 71 71 private: 72 72 Factory() {} // don't create 73 Factory(const Factory& factory) {}// don't copy73 Factory(const Factory& factory); // don't copy 74 74 ~Factory() {} // don't delete 75 75 -
code/trunk/src/core/Functor.h
r1062 r1064 429 429 430 430 431 431 // disable annoying warning about forcing value to boolean 432 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC 433 #pragma warning(push) 434 #pragma warning(disable:4100 4800) 435 #endif 432 436 433 437 #define CREATE_ALL_STATIC_FUNCTORS() \ … … 465 469 } 466 470 471 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC 472 #pragma warning(pop) 473 #endif 474 467 475 #endif /* _Functor_H__ */ -
code/trunk/src/core/Identifier.h
r1063 r1064 225 225 private: 226 226 Identifier(); 227 Identifier(const Identifier& identifier) {}// don't copy227 Identifier(const Identifier& identifier); // don't copy 228 228 virtual ~Identifier(); 229 229 void initialize(std::set<const Identifier*>* parents); -
code/trunk/src/core/IdentifierDistributor.h
r1062 r1064 53 53 private: 54 54 IdentifierDistributor() {}; // Don't create 55 IdentifierDistributor(const IdentifierDistributor& distributor) {}// Don't copy55 IdentifierDistributor(const IdentifierDistributor& distributor); // Don't copy 56 56 ~IdentifierDistributor() {} // Don't delete 57 57 -
code/trunk/src/core/Language.h
r1062 r1064 123 123 private: 124 124 Language(); 125 Language(const Language& language) {}// don't copy125 Language(const Language& language); // don't copy 126 126 virtual ~Language() {}; // don't delete 127 127 -
code/trunk/src/core/OutputHandler.h
r1062 r1064 114 114 private: 115 115 explicit OutputHandler(const std::string& logfilename); 116 OutputHandler(const OutputHandler& oh) {};// don't copy116 OutputHandler(const OutputHandler& oh); // don't copy 117 117 virtual ~OutputHandler(); 118 118 std::ofstream logfile_; //!< The logfile where the output is logged -
code/trunk/src/network/ConnectionManager.cc
r1056 r1064 114 114 115 115 bool ConnectionManager::addPacket(ENetPacket *packet, ENetPeer *peer) { 116 if(enet_peer_send(peer, head_->findClient(&(peer->address))->getID() , packet)!=0)116 if(enet_peer_send(peer, (enet_uint8)head_->findClient(&(peer->address))->getID() , packet)!=0) 117 117 return false; 118 118 return true; … … 120 120 121 121 bool ConnectionManager::addPacket(ENetPacket *packet, int clientID) { 122 if(enet_peer_send(head_->findClient(clientID)->getPeer(), clientID, packet)!=0)122 if(enet_peer_send(head_->findClient(clientID)->getPeer(), (enet_uint8)clientID, packet)!=0) 123 123 return false; 124 124 return true; … … 127 127 bool ConnectionManager::addPacketAll(ENetPacket *packet) { 128 128 for(ClientInformation *i=head_->next(); i!=0; i=i->next()){ 129 if(enet_peer_send(i->getPeer(), i->getID(), packet)!=0)129 if(enet_peer_send(i->getPeer(), (enet_uint8)i->getID(), packet)!=0) 130 130 return false; 131 131 } -
code/trunk/src/network/GameStateManager.cc
r1062 r1064 133 133 // run Synchronisable::getData with offset and additional place for 3 ints in between (for ids and length) 134 134 sync=it->getData((retval->data)+offset+3*sizeof(int)); 135 *(retval->data+offset)= sync.length;136 *(retval->data+offset+sizeof(int))= sync.objectID;137 *(retval->data+offset+2*sizeof(int))= sync.classID;135 *(retval->data+offset)=(unsigned char)sync.length; 136 *(retval->data+offset+sizeof(int))=(unsigned char)sync.objectID; 137 *(retval->data+offset+2*sizeof(int))=(unsigned char)sync.classID; 138 138 // increase data pointer 139 139 offset+=tempsize+3*sizeof(int); -
code/trunk/src/network/PacketDecoder.cc
r1062 r1064 153 153 } 154 154 //since it's not alowed to use void* for pointer arithmetic 155 //FIXME: variable never used 155 156 unsigned char* data = (unsigned char *)(packet->data); 156 157 //copy the GameStateCompressed id into the struct, which is located at second place data+sizeof( int ) -
code/trunk/src/orxonox/OrxonoxPlatform.h
r1056 r1064 226 226 //# pragma warning (disable : 4305) 227 227 228 // disable: "<type> needs to have dll-interface to be used by clients'228 // set to level 4: "<type> needs to have dll-interface to be used by clients' 229 229 // Happens on STL member variables which are not public therefore is ok 230 // This has been dealt with in base_properties of the solution since the 231 // warning primarily occurs in library header files (which are mostly 232 // included before OrxonoxPlatform.h is) 233 //# pragma warning (disable : 4251) 230 # pragma warning (disable : 4251) 234 231 235 232 // disable: 'MultiTypeString' : multiple assignment operators specified -
code/trunk/src/orxonox/OrxonoxStableHeaders.h
r1056 r1064 55 55 #include <OgreFrameListener.h> 56 56 #include <OgreLight.h> 57 #include <OgreLog.h> 58 #include <OgreLogManager.h> 57 59 #include <OgreMath.h> 58 60 #include <OgreMatrix3.h> … … 62 64 #include <OgreParticleEmitter.h> 63 65 #include <OgreParticleSystem.h> 64 #include <OgrePlatform.h>65 #include <OgrePrerequisites.h>66 66 #include <OgreQuaternion.h> 67 67 #include <OgreResourceGroupManager.h> … … 81 81 #include <OIS/OIS.h> 82 82 83 /** 84 * Some of the not so stable header files. 85 * It's not very useful to include them anyway.. 86 **/ 83 //----------------------------------------------------------------------- 84 // ORXONOX HEADERS 85 //----------------------------------------------------------------------- 87 86 88 #include "core/CoreIncludes.h" 89 #include "core/BaseObject.h" 90 #include "core/Tickable.h" 91 #include "core/Error.h" 92 #include "core/Loader.h" 93 #include "core/XMLPort.h" 94 95 #include "network/Synchronisable.h" 96 //#include "network/Server.h" 97 //#include "network/Client.h" 98 87 #include "util/Convert.h" 99 88 #include "util/Math.h" 100 #include "util/Sleep.h"101 #include "util/String2Number.h"102 #include "util/Tokenizer.h"103 89 #include "util/Multitype.h" 104 90 #include "util/MultiTypeMath.h" 105 91 #include "util/MultiTypePrimitive.h" 106 92 #include "util/MultiTypeString.h" 107 #include "util/substring.h" 93 #include "util/Sleep.h" 94 #include "util/String.h" 95 #include "util/SubString.h" 108 96 #include "util/XMLIncludes.h" 109 110 97 #include "util/tinyxml/ticpp.h" 111 98 #include "util/tinyxml/tinyxml.h" 112 99 100 #include "core/BaseObject.h" 101 #include "core/CommandExecutor.h" 102 #include "core/CoreIncludes.h" 103 #include "core/ConfigValueIncludes.h" 104 #include "core/Debug.h" 105 #include "core/Executor.h" 106 #include "core/Tickable.h" 107 #include "core/XMLPort.h" 108 109 #include "network/Synchronisable.h" 110 111 #include "OrxonoxPlatform.h" 112 #include "OrxonoxPrereqs.h" 113 #include "tools/Timer.h" 113 114 #include "objects/Model.h" 114 115 #include "objects/WorldEntity.h" -
code/trunk/src/orxonox/objects/Ambient.cc
r1056 r1064 36 36 37 37 #include "util/tinyxml/tinyxml.h" 38 #include "util/ Tokenizer.h"39 #include "util/ String2Number.h"38 #include "util/SubString.h" 39 #include "util/Convert.h" 40 40 #include "util/Math.h" 41 41 #include "core/Debug.h" … … 67 67 if (xmlElem->Attribute("colourvalue")) 68 68 { 69 SubString colourvalues(xmlElem->Attribute("colourvalue"), ','); 69 70 70 std::vector<std::string> colourvalues = tokenize(xmlElem->Attribute("colourvalue"),",");71 71 float r, g, b; 72 String2Number<float>(r, colourvalues[0]);73 String2Number<float>(g, colourvalues[1]);74 String2Number<float>(b, colourvalues[2]);72 convertValue<std::string, float>(&r, colourvalues[0]); 73 convertValue<std::string, float>(&g, colourvalues[1]); 74 convertValue<std::string, float>(&b, colourvalues[2]); 75 75 76 76 this->setAmbientLight(ColourValue(r, g, b)); -
code/trunk/src/orxonox/objects/Camera.cc
r1056 r1064 38 38 39 39 #include "util/tinyxml/tinyxml.h" 40 #include "util/ Tokenizer.h"41 #include "util/ String2Number.h"40 #include "util/Substring.h" 41 #include "util/Convert.h" 42 42 #include "util/Math.h" 43 43 #include "core/Debug.h" … … 73 73 74 74 float x, y, z; 75 std::vector<std::string> posVec = tokenize(xmlElem->Attribute("pos"),",");76 String2Number<float>(x, posVec[0]);77 String2Number<float>(y, posVec[1]);78 String2Number<float>(z, posVec[2]);75 SubString posVec(xmlElem->Attribute("pos"), ','); 76 convertValue<std::string, float>(&x, posVec[0]); 77 convertValue<std::string, float>(&y, posVec[1]); 78 convertValue<std::string, float>(&z, posVec[2]); 79 79 80 80 cam->setPosition(Vector3(x,y,z)); 81 81 82 posVec = tokenize(xmlElem->Attribute("lookat"),",");83 String2Number<float>(x, posVec[0]);84 String2Number<float>(y, posVec[1]);85 String2Number<float>(z, posVec[2]);82 posVec = SubString(xmlElem->Attribute("lookat"), ','); 83 convertValue<std::string, float>(&x, posVec[0]); 84 convertValue<std::string, float>(&y, posVec[1]); 85 convertValue<std::string, float>(&z, posVec[2]); 86 86 87 87 cam->lookAt(Vector3(x,y,z)); … … 93 93 94 94 // FIXME: unused var 95 Ogre::Viewport* vp = GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam); 95 //Ogre::Viewport* vp = 96 GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam); 96 97 97 98 -
code/trunk/src/orxonox/objects/Model.cc
r1056 r1064 31 31 32 32 #include "util/tinyxml/tinyxml.h" 33 #include "util/Tokenizer.h"34 #include "util/String2Number.h"35 33 #include "core/CoreIncludes.h" 36 34 #include "GraphicsEngine.h" -
code/trunk/src/orxonox/objects/Skybox.cc
r1056 r1064 35 35 36 36 #include "util/tinyxml/tinyxml.h" 37 //#include "util/Tokenizer.h"38 //#include "util/String2Number.h"39 37 #include "GraphicsEngine.h" 40 38 #include "core/CoreIncludes.h" -
code/trunk/src/orxonox/objects/SpaceShip.cc
r1056 r1064 39 39 40 40 #include "util/tinyxml/tinyxml.h" 41 #include "util/ String2Number.h"41 #include "util/Convert.h" 42 42 #include "util/Math.h" 43 43 #include "core/CoreIncludes.h" … … 259 259 std::string rdStr = xmlElem->Attribute("rotDamp"); 260 260 261 String2Number<float>(this->maxSpeed_, msStr);262 String2Number<float>(this->maxSideAndBackSpeed_, msabsStr);263 String2Number<float>(this->maxRotation_, mrStr);264 String2Number<float>(this->translationAcceleration_, taStr);265 String2Number<float>(this->rotationAcceleration_, raStr);266 String2Number<float>(this->translationDamping_, tdStr);267 String2Number<float>(this->rotationDamping_, rdStr);261 convertValue<std::string, float>(&this->maxSpeed_, msStr); 262 convertValue<std::string, float>(&this->maxSideAndBackSpeed_, msabsStr); 263 convertValue<std::string, float>(&this->maxRotation_, mrStr); 264 convertValue<std::string, float>(&this->translationAcceleration_, taStr); 265 convertValue<std::string, float>(&this->rotationAcceleration_, raStr); 266 convertValue<std::string, float>(&this->translationDamping_, tdStr); 267 convertValue<std::string, float>(&this->rotationDamping_, rdStr); 268 268 269 269 this->maxRotationRadian_ = Radian(this->maxRotation_); … … 458 458 459 459 OIS::Keyboard* mKeyboard = InputManager::getSingleton().getKeyboard(); 460 OIS::Mouse* mMouse = InputManager::getSingleton().getMouse(); 460 //FIXME: variable never used 461 //OIS::Mouse* mMouse = InputManager::getSingleton().getMouse(); 461 462 462 463 -
code/trunk/src/orxonox/objects/WorldEntity.cc
r1056 r1064 34 34 35 35 #include "util/tinyxml/tinyxml.h" 36 #include "util/Tokenizer.h" 37 #include "util/String2Number.h" 36 #include "util/SubString.h" 38 37 #include "core/CoreIncludes.h" 39 38 #include "GraphicsEngine.h" -
code/trunk/src/util/Convert.h
r1062 r1064 43 43 #include "SubString.h" 44 44 #include "MultiTypeMath.h" 45 46 // disable annoying warning about forcing value to boolean 47 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC 48 #pragma warning(push) 49 #pragma warning(disable:4100 4800) 50 #endif 45 51 46 52 … … 620 626 }; 621 627 628 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC 629 #pragma warning(pop) 630 #endif 631 622 632 #endif /* _Convert_H__ */ -
code/trunk/src/util/MultiTypeMath.h
r1056 r1064 35 35 #include "MultiTypeString.h" 36 36 #include "Math.h" 37 38 // disable annoying warning about multiple assignment operators 39 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC 40 #pragma warning(push) 41 #pragma warning(disable:4522) 42 #endif 37 43 38 44 class _UtilExport MultiTypeMath : public MultiTypeString … … 160 166 _UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm); 161 167 168 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC 169 #pragma warning(pop) 170 #endif 171 162 172 #endif /* _MultiTypeMath_H__ */ -
code/trunk/src/util/MultiTypeString.cc
r1056 r1064 120 120 return MultiTypePrimitive::toString(); 121 121 122 return output; 122 // FIXME: unreachable code 123 // return output; 123 124 } 124 125 -
code/trunk/src/util/MultiTypeString.h
r1062 r1064 37 37 38 38 #include "MultiTypePrimitive.h" 39 40 // disable annoying warning about multiple assignment operators 41 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC 42 #pragma warning(push) 43 #pragma warning(disable:4522) 44 #endif 39 45 40 46 class _UtilExport MultiTypeString : public MultiTypePrimitive … … 117 123 _UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeString& mts); 118 124 125 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC 126 #pragma warning(pop) 127 #endif 128 119 129 #endif /* _MultiTypeString_H__ */ -
code/trunk/src/util/String.cc
r1062 r1064 308 308 for (unsigned int i = 0; i < str->size(); ++i) 309 309 { 310 (*str)[i] = tolower((*str)[i]);310 (*str)[i] = (char)tolower((*str)[i]); 311 311 } 312 312 } … … 332 332 for (unsigned int i = 0; i < str->size(); ++i) 333 333 { 334 (*str)[i] = toupper((*str)[i]);334 (*str)[i] = (char)toupper((*str)[i]); 335 335 } 336 336 } -
code/trunk/visual_studio/orxonox_vc8.sln
r1024 r1064 38 38 EndProjectSection 39 39 ProjectSection(ProjectDependencies) = postProject 40 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 41 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 40 42 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497} 41 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}42 43 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 43 44 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 44 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}45 45 EndProjectSection 46 46 EndProject … … 67 67 Debug|Win32 = Debug|Win32 68 68 Release|Win32 = Release|Win32 69 static_libs_debug|Win32 = static_libs_debug|Win32 70 static_libs_release|Win32 = static_libs_release|Win32 69 71 EndGlobalSection 70 72 GlobalSection(ProjectConfigurationPlatforms) = postSolution … … 73 75 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.ActiveCfg = Release|Win32 74 76 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.Build.0 = Release|Win32 77 {4733BD1A-E04C-458D-8BFB-5010250EA497}.static_libs_debug|Win32.ActiveCfg = Release|Win32 78 {4733BD1A-E04C-458D-8BFB-5010250EA497}.static_libs_release|Win32.ActiveCfg = Release|Win32 75 79 {271715F3-5B90-4110-A552-70C788084A86}.Debug|Win32.ActiveCfg = Debug|Win32 76 80 {271715F3-5B90-4110-A552-70C788084A86}.Debug|Win32.Build.0 = Debug|Win32 77 81 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.ActiveCfg = Release|Win32 78 82 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.Build.0 = Release|Win32 83 {271715F3-5B90-4110-A552-70C788084A86}.static_libs_debug|Win32.ActiveCfg = Release|Win32 84 {271715F3-5B90-4110-A552-70C788084A86}.static_libs_release|Win32.ActiveCfg = Release|Win32 79 85 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.ActiveCfg = Debug|Win32 80 86 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.Build.0 = Debug|Win32 81 87 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Release|Win32.ActiveCfg = Release|Win32 82 88 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Release|Win32.Build.0 = Release|Win32 89 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.static_libs_debug|Win32.ActiveCfg = Release|Win32 90 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.static_libs_release|Win32.ActiveCfg = Release|Win32 83 91 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.ActiveCfg = Debug|Win32 84 92 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.Build.0 = Debug|Win32 85 93 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32 86 94 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32 95 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.static_libs_debug|Win32.ActiveCfg = Release|Win32 96 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.static_libs_release|Win32.ActiveCfg = Release|Win32 87 97 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.Debug|Win32.ActiveCfg = Debug|Win32 88 98 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.Debug|Win32.Build.0 = Debug|Win32 89 99 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.Release|Win32.ActiveCfg = Release|Win32 90 100 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.Release|Win32.Build.0 = Release|Win32 101 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.static_libs_debug|Win32.ActiveCfg = Release|Win32 102 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.static_libs_release|Win32.ActiveCfg = Release|Win32 91 103 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Debug|Win32.ActiveCfg = Debug|Win32 92 104 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Release|Win32.ActiveCfg = Release|Win32 105 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_debug|Win32.ActiveCfg = Debug|Win32 106 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_debug|Win32.Build.0 = Debug|Win32 107 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_release|Win32.ActiveCfg = Release|Win32 108 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_release|Win32.Build.0 = Release|Win32 93 109 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Debug|Win32.ActiveCfg = Debug|Win32 94 110 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Release|Win32.ActiveCfg = Release|Win32 111 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.static_libs_debug|Win32.ActiveCfg = Debug|Win32 112 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.static_libs_debug|Win32.Build.0 = Debug|Win32 113 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.static_libs_release|Win32.ActiveCfg = Release|Win32 114 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.static_libs_release|Win32.Build.0 = Release|Win32 95 115 EndGlobalSection 96 116 GlobalSection(SolutionProperties) = preSolution -
code/trunk/visual_studio/vc8/network.vcproj
r1024 r1064 323 323 </File> 324 324 <File 325 RelativePath="..\..\src\network\NetworkFrameListener.h"326 >327 </File>328 <File329 325 RelativePath="..\..\src\network\NetworkPrereqs.h" 330 326 > -
code/trunk/visual_studio/vc8/tolua++.vcproj
r1059 r1064 71 71 Name="Release|Win32" 72 72 ConfigurationType="4" 73 InheritedPropertySheets="$(SolutionDir)base_properties_release.vsprops;..\t ixml_properties.vsprops"73 InheritedPropertySheets="$(SolutionDir)base_properties_release.vsprops;..\tolua++_properties.vsprops" 74 74 CharacterSet="1" 75 75 WholeProgramOptimization="1" -
code/trunk/visual_studio/vc8/util.vcproj
r1059 r1064 227 227 </File> 228 228 <File 229 RelativePath="..\..\src\util\String2Number.h"230 >231 </File>232 <File233 229 RelativePath="..\..\src\util\SubString.h" 234 >235 </File>236 <File237 RelativePath="..\..\src\util\Tokenizer.h"238 230 > 239 231 </File>
Note: See TracChangeset
for help on using the changeset viewer.
