forked from 0ad/0ad
Sets SDL2 as default and only build option on Windows.
Removes remnants of WSDL. Refs #2041 This was SVN commit r16357.
This commit is contained in:
parent
d644845ae5
commit
e48e330db7
@ -580,12 +580,7 @@ extern_lib_defs = {
|
||||
sdl = {
|
||||
compile_settings = function()
|
||||
if os.is("windows") then
|
||||
if _OPTIONS["sdl2"] then
|
||||
includedirs { libraries_dir .. "sdl2/include/SDL" }
|
||||
defines { "CONFIG2_WSDL=0" }
|
||||
else
|
||||
includedirs { libraries_dir .. "sdl/include/SDL" }
|
||||
end
|
||||
includedirs { libraries_dir .. "sdl2/include/SDL" }
|
||||
elseif not _OPTIONS["android"] then
|
||||
-- Support SDL*_CONFIG for overriding the default PATH-based sdl*-config
|
||||
if _OPTIONS["sdl2"] then
|
||||
@ -605,11 +600,7 @@ extern_lib_defs = {
|
||||
end,
|
||||
link_settings = function()
|
||||
if os.is("windows") then
|
||||
if _OPTIONS["sdl2"] then
|
||||
add_default_lib_paths("sdl2")
|
||||
else
|
||||
add_default_lib_paths("sdl")
|
||||
end
|
||||
add_default_lib_paths("sdl2")
|
||||
elseif not _OPTIONS["android"] then
|
||||
if _OPTIONS["sdl2"] then
|
||||
sdl_config_path = os.getenv("SDL2_CONFIG")
|
||||
|
||||
@ -3,5 +3,5 @@ rem ** Create Visual Studio Workspaces on Windows **
|
||||
|
||||
cd ..\premake
|
||||
rem ** Support for Visual Studio versions <2013 has been dropped (check #2669).
|
||||
if not exist ..\workspaces\vc2013\SKIP_PREMAKE_HERE premake4\bin\release\premake4 --outpath="../workspaces/vc2013" --collada --use-shared-glooxwrapper --sdl2 %* vs2013
|
||||
if not exist ..\workspaces\vc2013\SKIP_PREMAKE_HERE premake4\bin\release\premake4 --outpath="../workspaces/vc2013" --collada --use-shared-glooxwrapper %* vs2013
|
||||
cd ..\workspaces
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (c) 2013 Wildfire Games
|
||||
/* Copyright (c) 2015 Wildfire Games
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
@ -56,20 +56,6 @@
|
||||
#define CONFIG2_CACHE_READ_ONLY 1
|
||||
#endif
|
||||
|
||||
// enable the wsdl emulator in Windows builds.
|
||||
//
|
||||
// NOTE: the official SDL distribution has two problems on Windows:
|
||||
// - it specifies "/defaultlib:msvcrt.lib". this is troublesome because
|
||||
// multiple heaps are active; errors result when allocated blocks are
|
||||
// (for reasons unknown) passed to a different heap to be freed.
|
||||
// one workaround is to add "/nodefaultlib:msvcrt.lib" to the linker
|
||||
// command line in debug configurations.
|
||||
// - it doesn't support color hardware mouse cursors and clashes with
|
||||
// cursor.cpp's efforts by resetting the mouse cursor after movement.
|
||||
#ifndef CONFIG2_WSDL
|
||||
# define CONFIG2_WSDL 1
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG2_FILE_ENABLE_AIO
|
||||
// work around a bug introduced in Linux 2.6.38
|
||||
// (http://www.wildfiregames.com/forum/index.php?showtopic=14561&view=findpost&p=217710)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (c) 2014 Wildfire Games
|
||||
/* Copyright (c) 2015 Wildfire Games
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
@ -28,11 +28,6 @@
|
||||
#define INCLUDED_SDL
|
||||
|
||||
#include "lib/external_libraries/libsdl_fwd.h"
|
||||
#include "lib/config2.h" // CONFIG2_WSDL
|
||||
|
||||
#if OS_WIN && CONFIG2_WSDL
|
||||
# include "lib/sysdep/os/win/wsdl.h"
|
||||
#else
|
||||
|
||||
# include "SDL.h"
|
||||
# include "SDL_thread.h"
|
||||
@ -53,8 +48,6 @@
|
||||
# endif
|
||||
# endif
|
||||
|
||||
#endif
|
||||
|
||||
// complete definition of our forward-declared SDL_Event (see sdl_fwd.h)
|
||||
struct SDL_Event_
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (c) 2013 Wildfire Games
|
||||
/* Copyright (c) 2015 Wildfire Games
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
@ -27,7 +27,6 @@
|
||||
#include "precompiled.h"
|
||||
#include "lib/sysdep/gfx.h"
|
||||
|
||||
#define WSDL_NO_KEYSYM
|
||||
#include "lib/external_libraries/libsdl.h"
|
||||
#include "lib/ogl.h"
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,343 +0,0 @@
|
||||
/* Copyright (c) 2012 Wildfire Games
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/*
|
||||
* emulate SDL on Windows.
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_WSDL
|
||||
#define INCLUDED_WSDL
|
||||
|
||||
#include "lib/lib_api.h"
|
||||
#include "lib/byte_order.h"
|
||||
#ifndef WSDL_NO_KEYSYM
|
||||
# include "SDL_keysym.h"
|
||||
#endif
|
||||
|
||||
typedef u8 Uint8;
|
||||
typedef u16 Uint16;
|
||||
typedef i16 Sint16;
|
||||
typedef u32 Uint32;
|
||||
|
||||
|
||||
// SDL_Init flags
|
||||
#define SDL_INIT_VIDEO 0
|
||||
#define SDL_INIT_AUDIO 0
|
||||
#define SDL_INIT_TIMER 0
|
||||
#define SDL_INIT_JOYSTICK 0
|
||||
#define SDL_INIT_NOPARACHUTE 0
|
||||
|
||||
LIB_API int SDL_Init(Uint32 flags);
|
||||
LIB_API int SDL_InitSubSystem(Uint32 flags);
|
||||
|
||||
LIB_API void SDL_Quit();
|
||||
|
||||
|
||||
//
|
||||
// video
|
||||
//
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SDL_GL_DEPTH_SIZE,
|
||||
SDL_GL_STENCIL_SIZE,
|
||||
SDL_GL_DOUBLEBUFFER, // ignored - always double buffered
|
||||
SDL_GL_SWAP_CONTROL
|
||||
}
|
||||
SDL_GLattr;
|
||||
|
||||
LIB_API int SDL_GL_SetAttribute(SDL_GLattr attr, int value);
|
||||
|
||||
// SDL_SetVideoMode() flags
|
||||
#define SDL_OPENGL 0
|
||||
#define SDL_FULLSCREEN 1
|
||||
#define SDL_RESIZABLE 2
|
||||
|
||||
struct SDL_PixelFormat
|
||||
{
|
||||
Uint8 BitsPerPixel;
|
||||
};
|
||||
|
||||
struct SDL_Surface
|
||||
{
|
||||
SDL_PixelFormat* format;
|
||||
int w, h;
|
||||
};
|
||||
|
||||
LIB_API SDL_Surface* SDL_SetVideoMode(int w, int h, int bpp, Uint32 flags);
|
||||
|
||||
LIB_API SDL_Surface* SDL_GetVideoSurface();
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint32 video_mem; // total amount of video memory (in K)
|
||||
}
|
||||
SDL_VideoInfo;
|
||||
|
||||
LIB_API SDL_VideoInfo* SDL_GetVideoInfo();
|
||||
|
||||
LIB_API void* SDL_GL_GetProcAddress(const char*);
|
||||
|
||||
LIB_API void SDL_GL_SwapBuffers();
|
||||
|
||||
LIB_API int SDL_SetGamma(float r, float g, float b);
|
||||
|
||||
|
||||
//
|
||||
// semaphores
|
||||
//
|
||||
|
||||
typedef void SDL_sem;
|
||||
LIB_API SDL_sem* SDL_CreateSemaphore(int cnt);
|
||||
LIB_API void SDL_DestroySemaphore(SDL_sem*);
|
||||
LIB_API int SDL_SemPost(SDL_sem*);
|
||||
LIB_API int SDL_SemWait(SDL_sem* sem);
|
||||
|
||||
|
||||
//
|
||||
// time
|
||||
//
|
||||
|
||||
LIB_API u32 SDL_GetTicks();
|
||||
LIB_API void SDL_Delay(u32 ms);
|
||||
|
||||
|
||||
//
|
||||
// mouse
|
||||
//
|
||||
|
||||
LIB_API void SDL_WarpMouse(int, int);
|
||||
|
||||
enum ShowCursorToggle
|
||||
{
|
||||
SDL_DISABLE = 0,
|
||||
SDL_ENABLE = 1,
|
||||
SDL_QUERY = 2
|
||||
};
|
||||
LIB_API int SDL_ShowCursor(int toggle);
|
||||
|
||||
LIB_API Uint8 SDL_GetMouseState(int* x, int* y);
|
||||
|
||||
|
||||
//
|
||||
// keyboard
|
||||
//
|
||||
|
||||
// from real SDL, but they're ignored anyway
|
||||
#define SDL_DEFAULT_REPEAT_DELAY 500
|
||||
#define SDL_DEFAULT_REPEAT_INTERVAL 30
|
||||
#define SDL_EnableKeyRepeat(delay, interval)
|
||||
|
||||
LIB_API Uint8* SDL_GetKeyState(int* num_keys);
|
||||
|
||||
|
||||
//
|
||||
// joystick
|
||||
//
|
||||
|
||||
typedef void* SDL_Joystick;
|
||||
int SDL_NumJoysticks();
|
||||
int SDL_JoystickEventState(int state);
|
||||
const char* SDL_JoystickName(int device_index);
|
||||
SDL_Joystick* SDL_JoystickOpen(int device_index);
|
||||
int SDL_JoystickNumAxes(SDL_Joystick* joystick);
|
||||
Sint16 SDL_JoystickGetAxis(SDL_Joystick* joystick, int axis);
|
||||
|
||||
|
||||
//
|
||||
// byte swapping
|
||||
//
|
||||
|
||||
#define SDL_LIL_ENDIAN 1234
|
||||
#define SDL_BIG_ENDIAN 4321
|
||||
|
||||
#define SDL_BYTEORDER SDL_LIL_ENDIAN
|
||||
|
||||
#define SDL_Swap16 swap16
|
||||
#define SDL_Swap32 swap32
|
||||
#define SDL_Swap64 swap64
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// events
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifndef WSDL_NO_KEYSYM
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SDLKey sym;
|
||||
u16 unicode;
|
||||
}
|
||||
SDL_keysym;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint8 type;
|
||||
SDL_keysym keysym;
|
||||
}
|
||||
SDL_KeyboardEvent;
|
||||
|
||||
#endif // #ifndef WSDL_NO_KEYSYM
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint8 type;
|
||||
u16 x, y;
|
||||
}
|
||||
SDL_MouseMotionEvent;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint8 type;
|
||||
}
|
||||
SDL_QuitEvent;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint8 type;
|
||||
}
|
||||
SDL_ExposeEvent;
|
||||
|
||||
enum SDL_MouseButtonEvent_button
|
||||
{
|
||||
// to remain compatible with regular SDL, these values must not change!
|
||||
SDL_BUTTON_LEFT = 1,
|
||||
SDL_BUTTON_MIDDLE = 2,
|
||||
SDL_BUTTON_RIGHT = 3,
|
||||
SDL_BUTTON_WHEELUP = 4,
|
||||
SDL_BUTTON_WHEELDOWN = 5,
|
||||
SDL_BUTTON_X1 = 6,
|
||||
SDL_BUTTON_X2 = 7
|
||||
};
|
||||
|
||||
#define SDL_BUTTON(b) (1u << (b-1))
|
||||
#define SDL_BUTTON_LMASK SDL_BUTTON(SDL_BUTTON_LEFT)
|
||||
#define SDL_BUTTON_MMASK SDL_BUTTON(SDL_BUTTON_MIDDLE)
|
||||
#define SDL_BUTTON_RMASK SDL_BUTTON(SDL_BUTTON_RIGHT)
|
||||
#define SDL_BUTTON_X1MASK SDL_BUTTON(SDL_BUTTON_X1)
|
||||
#define SDL_BUTTON_X2MASK SDL_BUTTON(SDL_BUTTON_X2)
|
||||
|
||||
enum SDL_MouseButtonEvent_state
|
||||
{
|
||||
SDL_RELEASED = 0,
|
||||
SDL_PRESSED = 1
|
||||
};
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint8 type;
|
||||
u8 button;
|
||||
u8 state;
|
||||
u16 x, y;
|
||||
}
|
||||
SDL_MouseButtonEvent;
|
||||
|
||||
enum SDL_ActiveEvent_state
|
||||
{
|
||||
SDL_APPACTIVE = 1,
|
||||
SDL_APPMOUSEFOCUS = 2,
|
||||
SDL_APPINPUTFOCUS = 4
|
||||
};
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint8 type;
|
||||
u8 gain;
|
||||
u8 state;
|
||||
}
|
||||
SDL_ActiveEvent;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint8 type;
|
||||
int w;
|
||||
int h;
|
||||
}
|
||||
SDL_ResizeEvent;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint8 type;
|
||||
int code;
|
||||
void* data1;
|
||||
}
|
||||
SDL_UserEvent;
|
||||
|
||||
enum SDL_Event_type
|
||||
{
|
||||
SDL_KEYDOWN,
|
||||
SDL_KEYUP,
|
||||
SDL_MOUSEMOTION,
|
||||
SDL_MOUSEBUTTONDOWN,
|
||||
SDL_MOUSEBUTTONUP,
|
||||
SDL_ACTIVEEVENT,
|
||||
SDL_QUIT,
|
||||
SDL_VIDEOEXPOSE,
|
||||
SDL_VIDEORESIZE,
|
||||
SDL_USEREVENT
|
||||
};
|
||||
|
||||
typedef union
|
||||
{
|
||||
Uint8 type;
|
||||
SDL_ActiveEvent active;
|
||||
#ifndef WSDL_NO_KEYSYM
|
||||
SDL_KeyboardEvent key;
|
||||
#endif
|
||||
SDL_MouseMotionEvent motion;
|
||||
SDL_MouseButtonEvent button;
|
||||
SDL_ResizeEvent resize;
|
||||
SDL_ExposeEvent expose;
|
||||
SDL_QuitEvent quit;
|
||||
SDL_UserEvent user;
|
||||
}
|
||||
SDL_Event;
|
||||
|
||||
LIB_API int SDL_EnableUNICODE(int enable);
|
||||
LIB_API int SDL_WaitEvent(SDL_Event*);
|
||||
LIB_API int SDL_PollEvent(SDL_Event* ev);
|
||||
LIB_API int SDL_PushEvent(SDL_Event* ev);
|
||||
|
||||
|
||||
//
|
||||
// misc
|
||||
//
|
||||
|
||||
enum SDL_GrabMode
|
||||
{
|
||||
SDL_GRAB_QUERY,
|
||||
SDL_GRAB_OFF,
|
||||
SDL_GRAB_ON
|
||||
};
|
||||
LIB_API SDL_GrabMode SDL_WM_GrabInput(SDL_GrabMode mode);
|
||||
|
||||
#define SDL_GetError() ""
|
||||
|
||||
LIB_API void SDL_WM_SetCaption(const char *title, const char *icon);
|
||||
|
||||
LIB_API Uint8 SDL_GetAppState();
|
||||
|
||||
// Pretend that we always implement the latest version of SDL 1.2 (but not 1.3)
|
||||
#define SDL_VERSION_ATLEAST(X, Y, Z) ((X) == 1 && (Y) <= 2)
|
||||
|
||||
#endif // #ifndef INCLUDED_WSDL
|
||||
Loading…
Reference in New Issue
Block a user