Browse Source

DEFINE_APPLICATION_MAIN -> URHO3D_DEFINE_APPLICATION_MAIN

Ivan K 10 years ago
parent
commit
31f3c9ab65
44 changed files with 45 additions and 45 deletions
  1. 1 1
      Docs/Reference.dox
  2. 1 1
      Source/Samples/01_HelloWorld/HelloWorld.cpp
  3. 1 1
      Source/Samples/02_HelloGUI/HelloGUI.cpp
  4. 1 1
      Source/Samples/03_Sprites/Sprites.cpp
  5. 1 1
      Source/Samples/04_StaticScene/StaticScene.cpp
  6. 1 1
      Source/Samples/05_AnimatingScene/AnimatingScene.cpp
  7. 1 1
      Source/Samples/06_SkeletalAnimation/SkeletalAnimation.cpp
  8. 1 1
      Source/Samples/07_Billboards/Billboards.cpp
  9. 1 1
      Source/Samples/08_Decals/Decals.cpp
  10. 1 1
      Source/Samples/09_MultipleViewports/MultipleViewports.cpp
  11. 1 1
      Source/Samples/10_RenderToTexture/RenderToTexture.cpp
  12. 1 1
      Source/Samples/11_Physics/Physics.cpp
  13. 1 1
      Source/Samples/12_PhysicsStressTest/PhysicsStressTest.cpp
  14. 1 1
      Source/Samples/13_Ragdolls/Ragdolls.cpp
  15. 1 1
      Source/Samples/14_SoundEffects/SoundEffects.cpp
  16. 1 1
      Source/Samples/15_Navigation/Navigation.cpp
  17. 1 1
      Source/Samples/16_Chat/Chat.cpp
  18. 1 1
      Source/Samples/17_SceneReplication/SceneReplication.cpp
  19. 1 1
      Source/Samples/18_CharacterDemo/CharacterDemo.cpp
  20. 1 1
      Source/Samples/19_VehicleDemo/VehicleDemo.cpp
  21. 1 1
      Source/Samples/20_HugeObjectCount/HugeObjectCount.cpp
  22. 1 1
      Source/Samples/21_AngelScriptIntegration/AngelScriptIntegration.cpp
  23. 1 1
      Source/Samples/22_LuaIntegration/LuaIntegration.cpp
  24. 1 1
      Source/Samples/23_Water/Water.cpp
  25. 1 1
      Source/Samples/24_Urho2DSprite/Urho2DSprite.cpp
  26. 1 1
      Source/Samples/25_Urho2DParticle/Urho2DParticle.cpp
  27. 1 1
      Source/Samples/26_ConsoleInput/ConsoleInput.cpp
  28. 1 1
      Source/Samples/27_Urho2DPhysics/Urho2DPhysics.cpp
  29. 1 1
      Source/Samples/28_Urho2DPhysicsRope/Urho2DPhysicsRope.cpp
  30. 1 1
      Source/Samples/29_SoundSynthesis/SoundSynthesis.cpp
  31. 1 1
      Source/Samples/30_LightAnimation/LightAnimation.cpp
  32. 1 1
      Source/Samples/31_MaterialAnimation/MaterialAnimation.cpp
  33. 1 1
      Source/Samples/32_Urho2DConstraints/Urho2DConstraints.cpp
  34. 1 1
      Source/Samples/33_Urho2DSpriterAnimation/Urho2DSpriterAnimation.cpp
  35. 1 1
      Source/Samples/34_DynamicGeometry/DynamicGeometry.cpp
  36. 1 1
      Source/Samples/35_SignedDistanceFieldText/SignedDistanceFieldText.cpp
  37. 1 1
      Source/Samples/36_Urho2DTileMap/Urho2DTileMap.cpp
  38. 1 1
      Source/Samples/37_UIDrag/UIDrag.cpp
  39. 1 1
      Source/Samples/38_SceneAndUILoad/SceneAndUILoad.cpp
  40. 1 1
      Source/Samples/39_CrowdNavigation/CrowdNavigation.cpp
  41. 1 1
      Source/Samples/40_Localization/L10n.cpp
  42. 1 1
      Source/Samples/41_DatabaseDemo/DatabaseDemo.cpp
  43. 1 1
      Source/Tools/Urho3DPlayer/Urho3DPlayer.cpp
  44. 2 2
      Source/Urho3D/Engine/Application.h

+ 1 - 1
Docs/Reference.dox

@@ -250,7 +250,7 @@ public:
     }
 };
 
-DEFINE_APPLICATION_MAIN(MyApp)
+URHO3D_DEFINE_APPLICATION_MAIN(MyApp)
 \endcode
 
 \page SceneModel Scene model

+ 1 - 1
Source/Samples/01_HelloWorld/HelloWorld.cpp

@@ -32,7 +32,7 @@
 #include <Urho3D/DebugNew.h>
 
 // Expands to this example's entry-point
-DEFINE_APPLICATION_MAIN(HelloWorld)
+URHO3D_DEFINE_APPLICATION_MAIN(HelloWorld)
 
 HelloWorld::HelloWorld(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/02_HelloGUI/HelloGUI.cpp

@@ -39,7 +39,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(HelloGUI)
+URHO3D_DEFINE_APPLICATION_MAIN(HelloGUI)
 
 HelloGUI::HelloGUI(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/03_Sprites/Sprites.cpp

@@ -37,7 +37,7 @@ static const unsigned NUM_SPRITES = 100;
 // Custom variable identifier for storing sprite velocity within the UI element
 static const StringHash VAR_VELOCITY("Velocity");
 
-DEFINE_APPLICATION_MAIN(Sprites)
+URHO3D_DEFINE_APPLICATION_MAIN(Sprites)
 
 Sprites::Sprites(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/04_StaticScene/StaticScene.cpp

@@ -40,7 +40,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(StaticScene)
+URHO3D_DEFINE_APPLICATION_MAIN(StaticScene)
 
 StaticScene::StaticScene(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/05_AnimatingScene/AnimatingScene.cpp

@@ -42,7 +42,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(AnimatingScene)
+URHO3D_DEFINE_APPLICATION_MAIN(AnimatingScene)
 
 AnimatingScene::AnimatingScene(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/06_SkeletalAnimation/SkeletalAnimation.cpp

@@ -45,7 +45,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(SkeletalAnimation)
+URHO3D_DEFINE_APPLICATION_MAIN(SkeletalAnimation)
 
 SkeletalAnimation::SkeletalAnimation(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/07_Billboards/Billboards.cpp

@@ -44,7 +44,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Billboards)
+URHO3D_DEFINE_APPLICATION_MAIN(Billboards)
 
 Billboards::Billboards(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/08_Decals/Decals.cpp

@@ -44,7 +44,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Decals)
+URHO3D_DEFINE_APPLICATION_MAIN(Decals)
 
 Decals::Decals(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/09_MultipleViewports/MultipleViewports.cpp

@@ -44,7 +44,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(MultipleViewports)
+URHO3D_DEFINE_APPLICATION_MAIN(MultipleViewports)
 
 MultipleViewports::MultipleViewports(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/10_RenderToTexture/RenderToTexture.cpp

@@ -45,7 +45,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(RenderToTexture)
+URHO3D_DEFINE_APPLICATION_MAIN(RenderToTexture)
 
 RenderToTexture::RenderToTexture(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/11_Physics/Physics.cpp

@@ -48,7 +48,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Physics)
+URHO3D_DEFINE_APPLICATION_MAIN(Physics)
 
 Physics::Physics(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/12_PhysicsStressTest/PhysicsStressTest.cpp

@@ -48,7 +48,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(PhysicsStressTest)
+URHO3D_DEFINE_APPLICATION_MAIN(PhysicsStressTest)
 
 PhysicsStressTest::PhysicsStressTest(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/13_Ragdolls/Ragdolls.cpp

@@ -48,7 +48,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Ragdolls)
+URHO3D_DEFINE_APPLICATION_MAIN(Ragdolls)
 
 Ragdolls::Ragdolls(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/14_SoundEffects/SoundEffects.cpp

@@ -55,7 +55,7 @@ static String soundResourceNames[] = {
     "Sounds/Powerup.wav"
 };
 
-DEFINE_APPLICATION_MAIN(SoundEffects)
+URHO3D_DEFINE_APPLICATION_MAIN(SoundEffects)
 
 SoundEffects::SoundEffects(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/15_Navigation/Navigation.cpp

@@ -44,7 +44,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Navigation)
+URHO3D_DEFINE_APPLICATION_MAIN(Navigation)
 
 Navigation::Navigation(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/16_Chat/Chat.cpp

@@ -55,7 +55,7 @@ const int MSG_CHAT = 32;
 // UDP port we will use
 const unsigned short CHAT_SERVER_PORT = 2345;
 
-DEFINE_APPLICATION_MAIN(Chat)
+URHO3D_DEFINE_APPLICATION_MAIN(Chat)
 
 Chat::Chat(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/17_SceneReplication/SceneReplication.cpp

@@ -67,7 +67,7 @@ static const unsigned CTRL_BACK = 2;
 static const unsigned CTRL_LEFT = 4;
 static const unsigned CTRL_RIGHT = 8;
 
-DEFINE_APPLICATION_MAIN(SceneReplication)
+URHO3D_DEFINE_APPLICATION_MAIN(SceneReplication)
 
 SceneReplication::SceneReplication(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/18_CharacterDemo/CharacterDemo.cpp

@@ -49,7 +49,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(CharacterDemo)
+URHO3D_DEFINE_APPLICATION_MAIN(CharacterDemo)
 
 CharacterDemo::CharacterDemo(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/19_VehicleDemo/VehicleDemo.cpp

@@ -51,7 +51,7 @@
 
 const float CAMERA_DISTANCE = 10.0f;
 
-DEFINE_APPLICATION_MAIN(VehicleDemo)
+URHO3D_DEFINE_APPLICATION_MAIN(VehicleDemo)
 
 VehicleDemo::VehicleDemo(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/20_HugeObjectCount/HugeObjectCount.cpp

@@ -42,7 +42,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(HugeObjectCount)
+URHO3D_DEFINE_APPLICATION_MAIN(HugeObjectCount)
 
 HugeObjectCount::HugeObjectCount(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/21_AngelScriptIntegration/AngelScriptIntegration.cpp

@@ -44,7 +44,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(AngelScriptIntegration)
+URHO3D_DEFINE_APPLICATION_MAIN(AngelScriptIntegration)
 
 AngelScriptIntegration::AngelScriptIntegration(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/22_LuaIntegration/LuaIntegration.cpp

@@ -45,7 +45,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(LuaIntegration)
+URHO3D_DEFINE_APPLICATION_MAIN(LuaIntegration)
 
 LuaIntegration::LuaIntegration(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/23_Water/Water.cpp

@@ -47,7 +47,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Water)
+URHO3D_DEFINE_APPLICATION_MAIN(Water)
 
 Water::Water(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/24_Urho2DSprite/Urho2DSprite.cpp

@@ -46,7 +46,7 @@ static const unsigned NUM_SPRITES = 200;
 static const StringHash VAR_MOVESPEED("MoveSpeed");
 static const StringHash VAR_ROTATESPEED("RotateSpeed");
 
-DEFINE_APPLICATION_MAIN(Urho2DSprite)
+URHO3D_DEFINE_APPLICATION_MAIN(Urho2DSprite)
 
 Urho2DSprite::Urho2DSprite(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/25_Urho2DParticle/Urho2DParticle.cpp

@@ -39,7 +39,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Urho2DParticle)
+URHO3D_DEFINE_APPLICATION_MAIN(Urho2DParticle)
 
 Urho2DParticle::Urho2DParticle(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/26_ConsoleInput/ConsoleInput.cpp

@@ -35,7 +35,7 @@
 #include <Urho3D/DebugNew.h>
 
 // Expands to this example's entry-point
-DEFINE_APPLICATION_MAIN(ConsoleInput)
+URHO3D_DEFINE_APPLICATION_MAIN(ConsoleInput)
 
 // Hunger level descriptions
 String hungerLevels[] = {

+ 1 - 1
Source/Samples/27_Urho2DPhysics/Urho2DPhysics.cpp

@@ -45,7 +45,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Urho2DPhysics)
+URHO3D_DEFINE_APPLICATION_MAIN(Urho2DPhysics)
 
 static const unsigned NUM_OBJECTS = 100;
 

+ 1 - 1
Source/Samples/28_Urho2DPhysicsRope/Urho2DPhysicsRope.cpp

@@ -43,7 +43,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Urho2DPhysicsRope)
+URHO3D_DEFINE_APPLICATION_MAIN(Urho2DPhysicsRope)
 
 static const unsigned NUM_OBJECTS = 10;
 

+ 1 - 1
Source/Samples/29_SoundSynthesis/SoundSynthesis.cpp

@@ -36,7 +36,7 @@
 #include <Urho3D/DebugNew.h>
 
 // Expands to this example's entry-point
-DEFINE_APPLICATION_MAIN(SoundSynthesis)
+URHO3D_DEFINE_APPLICATION_MAIN(SoundSynthesis)
 
 SoundSynthesis::SoundSynthesis(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/30_LightAnimation/LightAnimation.cpp

@@ -42,7 +42,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(LightAnimation)
+URHO3D_DEFINE_APPLICATION_MAIN(LightAnimation)
 
 LightAnimation::LightAnimation(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/31_MaterialAnimation/MaterialAnimation.cpp

@@ -41,7 +41,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(MaterialAnimation)
+URHO3D_DEFINE_APPLICATION_MAIN(MaterialAnimation)
 
 MaterialAnimation::MaterialAnimation(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/32_Urho2DConstraints/Urho2DConstraints.cpp

@@ -62,7 +62,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Urho2DConstraints)
+URHO3D_DEFINE_APPLICATION_MAIN(Urho2DConstraints)
 
 Node* pickedNode;
 RigidBody2D* dummyBody;

+ 1 - 1
Source/Samples/33_Urho2DSpriterAnimation/Urho2DSpriterAnimation.cpp

@@ -39,7 +39,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Urho2DSpriterAnimation)
+URHO3D_DEFINE_APPLICATION_MAIN(Urho2DSpriterAnimation)
 
 Urho2DSpriterAnimation::Urho2DSpriterAnimation(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/34_DynamicGeometry/DynamicGeometry.cpp

@@ -46,7 +46,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(DynamicGeometry)
+URHO3D_DEFINE_APPLICATION_MAIN(DynamicGeometry)
 
 DynamicGeometry::DynamicGeometry(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/35_SignedDistanceFieldText/SignedDistanceFieldText.cpp

@@ -41,7 +41,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(SignedDistanceFieldText)
+URHO3D_DEFINE_APPLICATION_MAIN(SignedDistanceFieldText)
 
 SignedDistanceFieldText::SignedDistanceFieldText(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/36_Urho2DTileMap/Urho2DTileMap.cpp

@@ -40,7 +40,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Urho2DTileMap)
+URHO3D_DEFINE_APPLICATION_MAIN(Urho2DTileMap)
 
 Urho2DTileMap::Urho2DTileMap(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/37_UIDrag/UIDrag.cpp

@@ -30,7 +30,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(UIDrag)
+URHO3D_DEFINE_APPLICATION_MAIN(UIDrag)
 
 UIDrag::UIDrag(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/38_SceneAndUILoad/SceneAndUILoad.cpp

@@ -36,7 +36,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(SceneAndUILoad)
+URHO3D_DEFINE_APPLICATION_MAIN(SceneAndUILoad)
 
 SceneAndUILoad::SceneAndUILoad(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/39_CrowdNavigation/CrowdNavigation.cpp

@@ -51,7 +51,7 @@
 
 static const String INSTRUCTION("instructionText");
 
-DEFINE_APPLICATION_MAIN(CrowdNavigation)
+URHO3D_DEFINE_APPLICATION_MAIN(CrowdNavigation)
 
 CrowdNavigation::CrowdNavigation(Context* context) :
     Sample(context),

+ 1 - 1
Source/Samples/40_Localization/L10n.cpp

@@ -39,7 +39,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(L10n)
+URHO3D_DEFINE_APPLICATION_MAIN(L10n)
 
 L10n::L10n(Context* context) :
     Sample(context)

+ 1 - 1
Source/Samples/41_DatabaseDemo/DatabaseDemo.cpp

@@ -34,7 +34,7 @@
 #include "DatabaseDemo.h"
 
 // Expands to this example's entry-point
-DEFINE_APPLICATION_MAIN(DatabaseDemo)
+URHO3D_DEFINE_APPLICATION_MAIN(DatabaseDemo)
 
 DatabaseDemo::DatabaseDemo(Context* context) :
     Sample(context),

+ 1 - 1
Source/Tools/Urho3DPlayer/Urho3DPlayer.cpp

@@ -38,7 +38,7 @@
 
 #include <Urho3D/DebugNew.h>
 
-DEFINE_APPLICATION_MAIN(Urho3DPlayer);
+URHO3D_DEFINE_APPLICATION_MAIN(Urho3DPlayer);
 
 Urho3DPlayer::Urho3DPlayer(Context* context) :
     Application(context)

+ 2 - 2
Source/Urho3D/Engine/Application.h

@@ -70,7 +70,7 @@ protected:
 
 // Macro for defining a main function which creates a Context and the application, then runs it
 #ifndef IOS
-#define DEFINE_APPLICATION_MAIN(className) \
+#define URHO3D_DEFINE_APPLICATION_MAIN(className) \
 int RunApplication() \
 { \
     Urho3D::SharedPtr<Urho3D::Context> context(new Urho3D::Context()); \
@@ -80,7 +80,7 @@ int RunApplication() \
 URHO3D_DEFINE_MAIN(RunApplication());
 #else
 // On iOS we will let this function exit, so do not hold the context and application in SharedPtr's
-#define DEFINE_APPLICATION_MAIN(className) \
+#define URHO3D_DEFINE_APPLICATION_MAIN(className) \
 int RunApplication() \
 { \
     Urho3D::Context* context = new Urho3D::Context(); \