Fixed compile errors with sfRenderWindow and sfImage in CSFML
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1004 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
c3687b4018
commit
f044357031
47 changed files with 398 additions and 391 deletions
|
@ -29,14 +29,7 @@
|
|||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Config.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Class wrapping an OpenGL context with no window.
|
||||
/// This class is for internal use mainly, it is required
|
||||
/// to solve tricky problems involving multi-threading
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfContext sfContext;
|
||||
#include <SFML/Window/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
|
@ -30,14 +30,7 @@
|
|||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Config.h>
|
||||
#include <SFML/Window/Event.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfInput handles real-time input from keyboard and mouse.
|
||||
/// Use it instead of events to handle continuous moves and more
|
||||
/// game-friendly inputs
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfInput sfInput;
|
||||
#include <SFML/Window/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
34
CSFML/include/SFML/Window/Types.h
Normal file
34
CSFML/include/SFML/Window/Types.h
Normal file
|
@ -0,0 +1,34 @@
|
|||
////////////////////////////////////////////////////////////
|
||||
//
|
||||
// SFML - Simple and Fast Multimedia Library
|
||||
// Copyright (C) 2007-2008-2008 Laurent Gomila (laurent.gom@gmail.com)
|
||||
//
|
||||
// This software is provided 'as-is', without any express or implied warranty.
|
||||
// In no event will the authors be held liable for any damages arising from the use of this software.
|
||||
//
|
||||
// Permission is granted to anyone to use this software for any purpose,
|
||||
// including commercial applications, and to alter it and redistribute it freely,
|
||||
// subject to the following restrictions:
|
||||
//
|
||||
// 1. The origin of this software must not be misrepresented;
|
||||
// you must not claim that you wrote the original software.
|
||||
// If you use this software in a product, an acknowledgment
|
||||
// in the product documentation would be appreciated but is not required.
|
||||
//
|
||||
// 2. Altered source versions must be plainly marked as such,
|
||||
// and must not be misrepresented as being the original software.
|
||||
//
|
||||
// 3. This notice may not be removed or altered from any source distribution.
|
||||
//
|
||||
////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef SFML_WINDOW_TYPES_H
|
||||
#define SFML_WINDOW_TYPES_H
|
||||
|
||||
|
||||
typedef struct sfContext sfContext;
|
||||
typedef struct sfInput sfInput;
|
||||
typedef struct sfWindow sfWindow;
|
||||
|
||||
|
||||
#endif // SFML_WINDOW_TYPES_H
|
|
@ -30,16 +30,9 @@
|
|||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Config.h>
|
||||
#include <SFML/Window/Event.h>
|
||||
#include <SFML/Window/Input.h>
|
||||
#include <SFML/Window/VideoMode.h>
|
||||
#include <SFML/Window/WindowHandle.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfWindow is a rendering window ; it can create a new window
|
||||
/// or connect to an existing one
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfWindow sfWindow;
|
||||
#include <SFML/Window/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue