Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2002-11-25 18:29:57 +0300
committerKent Mein <mein@cs.umn.edu>2002-11-25 18:29:57 +0300
commit209a2ede2cdeade0d543969e7b2ff62fee84b43e (patch)
tree28484297290b14033587b3704535db4a0bb06c71 /source/gameengine/GamePlayer
parentd0e346d544cd3abb0007a68137b31923020f7aeb (diff)
Last of the config.h mods...
#ifdef HAVE_CONFIG_H #include <config.h> #endif added to these files. Kent -- mein@cs.umn.edu
Diffstat (limited to 'source/gameengine/GamePlayer')
-rw-r--r--source/gameengine/GamePlayer/common/GPC_Canvas.cpp4
-rw-r--r--source/gameengine/GamePlayer/common/GPC_Engine.cpp5
-rw-r--r--source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp3
-rw-r--r--source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp3
-rw-r--r--source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp6
-rw-r--r--source/gameengine/GamePlayer/common/GPC_RawImage.cpp5
-rw-r--r--source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp5
-rw-r--r--source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp5
-rw-r--r--source/gameengine/GamePlayer/common/GPC_RenderTools.cpp3
-rw-r--r--source/gameengine/GamePlayer/common/GPC_System.cpp5
-rw-r--r--source/gameengine/GamePlayer/common/bmfont.cpp4
-rw-r--r--source/gameengine/GamePlayer/common/unix/GPU_Canvas.cpp5
-rw-r--r--source/gameengine/GamePlayer/common/unix/GPU_Engine.cpp6
-rw-r--r--source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp4
-rw-r--r--source/gameengine/GamePlayer/common/unix/GPU_System.cpp4
-rw-r--r--source/gameengine/GamePlayer/common/windows/GPW_Canvas.cpp4
-rw-r--r--source/gameengine/GamePlayer/common/windows/GPW_Engine.cpp3
-rw-r--r--source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp3
-rw-r--r--source/gameengine/GamePlayer/common/windows/GPW_System.cpp4
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_Application.cpp4
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp5
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp4
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_System.cpp5
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_ghost.cpp4
24 files changed, 84 insertions, 19 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
index 4e59863f510..df2722afa68 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
@@ -30,6 +30,10 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
#include <windows.h>
#endif
diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.cpp b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
index 8c54362e17a..a9a099bf070 100644
--- a/source/gameengine/GamePlayer/common/GPC_Engine.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
@@ -29,6 +29,11 @@
*
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#endif // WIN32
diff --git a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
index 7cd1e48f9b3..71e20bfe35d 100644
--- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
@@ -33,6 +33,9 @@
#include <iostream.h>
#include "GPC_KeyboardDevice.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
/**
* NextFrame toggles currentTable with previousTable,
diff --git a/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp b/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp
index a6ce7b3ae0d..bfd1acaf65d 100644
--- a/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp
@@ -32,6 +32,9 @@
#include "GPC_MouseDevice.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
GPC_MouseDevice::GPC_MouseDevice()
{
diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
index 77488597a70..2741ba048c8 100644
--- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
@@ -30,10 +30,12 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#include "GPC_PolygonMaterial.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "GPC_PolygonMaterial.h"
#include "MT_Vector3.h"
-
#include "RAS_IRasterizer.h"
/* This list includes only data type definitions */
diff --git a/source/gameengine/GamePlayer/common/GPC_RawImage.cpp b/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
index 0a4b6ff3df6..7d0886a292b 100644
--- a/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
@@ -34,9 +34,12 @@
#include <string.h>
#include "GPC_RawImage.h"
-
#include "GPC_RawLogoArrays.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
GPC_RawImage::GPC_RawImage()
: m_data(0), m_dataSize(0), m_width(0), m_height(0)
diff --git a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp
index 6ab2f1220e5..2ccd98b368a 100644
--- a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp
@@ -31,10 +31,11 @@
// This file is automatically generated. Do not edit by hand!
-
-
#include "GPC_RawLoadDotBlendArray.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
void GetRawLoadingAnimation(unsigned char **data, int *dataSize)
{
diff --git a/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp b/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp
index 0afb241408e..955a644513a 100644
--- a/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp
@@ -31,10 +31,11 @@
// This file is automatically generated. Do not edit by hand!
-
-
#include "GPC_RawLogoArrays.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
void GetRawBlenderLogo(unsigned char **data, int *width, int *height)
{
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
index 329cf1c4bad..12212cfd182 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
@@ -30,6 +30,9 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef WIN32
#pragma warning (disable : 4786)
diff --git a/source/gameengine/GamePlayer/common/GPC_System.cpp b/source/gameengine/GamePlayer/common/GPC_System.cpp
index 7c5c16a0b48..31393505796 100644
--- a/source/gameengine/GamePlayer/common/GPC_System.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_System.cpp
@@ -35,6 +35,9 @@
#include "GPC_KeyboardDevice.h"
#include "NG_NetworkDeviceInterface.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
GPC_System::GPC_System()
// : m_ndi(0)
@@ -87,4 +90,4 @@ NG_NetworkDeviceInterface* GPC_System::GetNetworkDevice() const
{
return m_ndi;
}
-*/ \ No newline at end of file
+*/
diff --git a/source/gameengine/GamePlayer/common/bmfont.cpp b/source/gameengine/GamePlayer/common/bmfont.cpp
index 752f2017c94..c98c85bc272 100644
--- a/source/gameengine/GamePlayer/common/bmfont.cpp
+++ b/source/gameengine/GamePlayer/common/bmfont.cpp
@@ -61,6 +61,10 @@
#include "BKE_bmfont.h"
#include "BKE_bmfont_types.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
/*MAART:
void printfGlyph(bmGlyph * glyph)
{
diff --git a/source/gameengine/GamePlayer/common/unix/GPU_Canvas.cpp b/source/gameengine/GamePlayer/common/unix/GPU_Canvas.cpp
index 29f0bffe1c5..d393f4196aa 100644
--- a/source/gameengine/GamePlayer/common/unix/GPU_Canvas.cpp
+++ b/source/gameengine/GamePlayer/common/unix/GPU_Canvas.cpp
@@ -31,9 +31,12 @@
*/
//#include <iostream>
-
#include "GPU_Canvas.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
GPU_Canvas::GPU_Canvas(KXH_plugin_handle p, int width, int height)
: GPC_Canvas(width, height), m_plugin(p)
{
diff --git a/source/gameengine/GamePlayer/common/unix/GPU_Engine.cpp b/source/gameengine/GamePlayer/common/unix/GPU_Engine.cpp
index 56b1340eb92..6bff9f20a6a 100644
--- a/source/gameengine/GamePlayer/common/unix/GPU_Engine.cpp
+++ b/source/gameengine/GamePlayer/common/unix/GPU_Engine.cpp
@@ -32,11 +32,8 @@
#include <assert.h>
#include <unistd.h>
-
#include "GPU_Engine.h"
-
#include "GPC_MouseDevice.h"
-
#include "GPU_Canvas.h"
#include "GPU_KeyboardDevice.h"
#include "GPU_System.h"
@@ -56,6 +53,9 @@
#include "GPC_RenderTools.h"
#include "GPC_RawImage.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
void Redraw(GPU_Engine *engine); // -the- redraw function
diff --git a/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
index 125adcc4b7b..bdd04fadb9b 100644
--- a/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
+++ b/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
@@ -32,6 +32,10 @@
#include <iostream.h>
#include "GPU_KeyboardDevice.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
void GPU_KeyboardDevice::register_X_key_down_event(KeySym k)
{
ConvertEvent(k, 1);
diff --git a/source/gameengine/GamePlayer/common/unix/GPU_System.cpp b/source/gameengine/GamePlayer/common/unix/GPU_System.cpp
index d7484c97dc2..eb2163f08bc 100644
--- a/source/gameengine/GamePlayer/common/unix/GPU_System.cpp
+++ b/source/gameengine/GamePlayer/common/unix/GPU_System.cpp
@@ -31,9 +31,11 @@
*/
#include <sys/time.h>
-
#include "GPU_System.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
static struct timeval startTime;
static int startTimeDone = 0;
diff --git a/source/gameengine/GamePlayer/common/windows/GPW_Canvas.cpp b/source/gameengine/GamePlayer/common/windows/GPW_Canvas.cpp
index de3f49e867e..372ab927118 100644
--- a/source/gameengine/GamePlayer/common/windows/GPW_Canvas.cpp
+++ b/source/gameengine/GamePlayer/common/windows/GPW_Canvas.cpp
@@ -32,6 +32,10 @@
#include "GPW_Canvas.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
GPW_Canvas::GPW_Canvas(HWND hWnd, HDC hDC, int width, int height)
: GPC_Canvas(width, height), m_hWnd(hWnd), m_hRC(0), m_hDC(hDC)
{
diff --git a/source/gameengine/GamePlayer/common/windows/GPW_Engine.cpp b/source/gameengine/GamePlayer/common/windows/GPW_Engine.cpp
index ff4dca9c50e..43d2ca9bb6e 100644
--- a/source/gameengine/GamePlayer/common/windows/GPW_Engine.cpp
+++ b/source/gameengine/GamePlayer/common/windows/GPW_Engine.cpp
@@ -48,6 +48,9 @@
#include "NG_NetworkScene.h"
#include "NG_LoopBackNetworkDeviceInterface.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
GPW_Engine::GPW_Engine(char *customLoadingAnimationURL,
int foregroundColor, int backgroundColor, int frameRate) :
diff --git a/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
index b9c884af525..e9d70722336 100644
--- a/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
+++ b/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
@@ -32,6 +32,9 @@
#include "GPW_KeyboardDevice.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
// Key code values not found in winuser.h
#ifndef VK_MINUS
diff --git a/source/gameengine/GamePlayer/common/windows/GPW_System.cpp b/source/gameengine/GamePlayer/common/windows/GPW_System.cpp
index ba71e036fc4..9dbd704daed 100644
--- a/source/gameengine/GamePlayer/common/windows/GPW_System.cpp
+++ b/source/gameengine/GamePlayer/common/windows/GPW_System.cpp
@@ -32,9 +32,11 @@
*/
#include <windows.h>
-
#include "GPW_System.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
GPW_System::GPW_System(void)
{
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index 07ed803b205..17e9e77b5d3 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -31,6 +31,10 @@
* GHOST Blender Player application implementation file.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#endif
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp b/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
index da71d40acc0..2d378473619 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
@@ -31,11 +31,12 @@
*/
#include "GPG_Canvas.h"
-
#include <assert.h>
-
#include "GHOST_ISystem.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
GPG_Canvas::GPG_Canvas(GHOST_IWindow* window)
: GPC_Canvas(0, 0), m_window(window)
diff --git a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
index 7971a86bcbc..0e474827ad5 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
@@ -31,9 +31,11 @@
* GHOST Blender Player keyboard device implementation.
*/
-
#include "GPG_KeyboardDevice.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
GPG_KeyboardDevice::GPG_KeyboardDevice(void)
{
diff --git a/source/gameengine/GamePlayer/ghost/GPG_System.cpp b/source/gameengine/GamePlayer/ghost/GPG_System.cpp
index 6084505bbba..d9f59f8b36a 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_System.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_System.cpp
@@ -32,11 +32,12 @@
*/
#include "GPG_System.h"
-
#include <assert.h>
-
#include "GHOST_ISystem.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
GPG_System::GPG_System(GHOST_ISystem* system)
: m_system(system)
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index df683cb91cf..f725d5c0dd3 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -34,6 +34,10 @@
#include <iostream>
#include <math.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef __linux__
#ifdef __alpha__
#include <signal.h>