abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Renames our sdl.h to libsdl.h, to avoid case sensitivity errors when it includes SDL.h.

Browse Source 
This was SVN commit r10904.
This commit is contained in:
historic_bruno 2012-01-12 23:32:27 +00:00
parent 72bd886f80
commit 893cb2668e
30 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/graphics/MapReader.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -29,7 +29,7 @@
#include "graphics/TerrainTextureEntry.h"
#include "graphics/TerrainTextureManager.h"
#include "lib/timer.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "maths/MathUtil.h"
#include "ps/CLogger.h"
#include "ps/Loader.h"

4
source/graphics/TextureConverter.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -20,7 +20,7 @@
#include "lib/file/vfs/vfs.h"
#include "lib/posix/posix_pthread.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "TextureManager.h"

4
source/graphics/tests/test_TextureManager.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -19,7 +19,7 @@
#include "graphics/TextureManager.h"
#include "lib/alignment.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/file/vfs/vfs.h"
#include "lib/res/h_mgr.h"
#include "lib/tex/tex.h"

4
source/gui/CDropDown.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -24,7 +24,7 @@ CDropDown
#include "CDropDown.h"
#include "lib/ogl.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
//-------------------------------------------------------------------

4
source/gui/CList.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -25,7 +25,7 @@ CList
#include "CGUIScrollBarVertical.h"
#include "ps/CLogger.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
//-------------------------------------------------------------------

4
source/gui/MiniMap.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -29,7 +29,7 @@
#include "graphics/TerrainTextureManager.h"
#include "graphics/TerritoryTexture.h"
#include "lib/ogl.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/bits.h"
#include "lib/timer.h"
#include "ps/Game.h"

4
source/gui/scripting/GuiScriptConversions.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -20,7 +20,7 @@
#include "scriptinterface/ScriptInterface.h"
#include "gui/IGUIObject.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "ps/Hotkey.h"
#include "js/jsapi.h"

4
source/lib/external_libraries/sdl.h → source/lib/external_libraries/libsdl.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010 Wildfire Games
/* 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
@ -27,7 +27,7 @@
#ifndef INCLUDED_SDL
#define INCLUDED_SDL
#include "lib/external_libraries/sdl_fwd.h"
#include "lib/external_libraries/libsdl_fwd.h"
#include "lib/config2.h" // CONFIG2_WSDL
#if OS_WIN && CONFIG2_WSDL

0
source/lib/external_libraries/sdl_fwd.h → source/lib/external_libraries/libsdl_fwd.h
View File

4
source/lib/input.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010 Wildfire Games
/* 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
@ -30,7 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
const size_t MAX_HANDLERS = 8;
static InHandler handler_stack[MAX_HANDLERS];

4
source/lib/input.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010 Wildfire Games
/* 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
@ -28,7 +28,7 @@
#define INCLUDED_INPUT
#include "lib/external_libraries/sdl_fwd.h"
#include "lib/external_libraries/libsdl_fwd.h"
// input handler return values.
enum InReaction

4
source/lib/ogl.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011 Wildfire Games
/* 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
@ -31,7 +31,7 @@
#include <string.h>
#include <stdarg.h>
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/debug.h"
#include "lib/sysdep/gfx.h"
#include "lib/res/h_mgr.h"

4
source/lib/sysdep/gfx.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010 Wildfire Games
/* 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
@ -28,7 +28,7 @@
#include "lib/sysdep/gfx.h"
#define WSDL_NO_KEYSYM
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/ogl.h"
#if OS_WIN

4
source/lib/sysdep/os/unix/unix.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011 Wildfire Games
/* 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
@ -26,7 +26,7 @@
#include <stdio.h>
#include <wchar.h>
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/utf8.h"
#include "lib/sysdep/sysdep.h"
#include "lib/sysdep/cursor.h"

4
source/lib/sysdep/os/win/wsdl.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010 Wildfire Games
/* 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
@ -25,7 +25,7 @@
*/
#include "precompiled.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#if CONFIG2_WSDL

4
source/main.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -38,7 +38,7 @@ that of Atlas depending on commandline parameters.
#include "lib/input.h"
#include "lib/ogl.h"
#include "lib/timer.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/res/sound/snd_mgr.h"
#include "ps/ArchiveBuilder.h"

4
source/network/tests/test_Net.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -19,7 +19,7 @@
#include "graphics/TerrainTextureManager.h"
#include "lib/external_libraries/enet.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/tex/tex.h"
#include "network/NetServer.h"
#include "network/NetClient.h"

2
source/ps/GameSetup/GameSetup.cpp
View File

@ -21,7 +21,7 @@
#include "lib/input.h"
#include "lib/ogl.h"
#include "lib/timer.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/file/common/file_stats.h"
#include "lib/res/h_mgr.h"
#include "lib/res/graphics/cursor.h"

4
source/ps/Globals.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,7 +18,7 @@
#include "precompiled.h"
#include "Globals.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
bool g_app_minimized = false;

4
source/ps/Hotkey.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -32,7 +32,7 @@
#include "CStr.h"
#include "lib/input.h"
#include "lib/external_libraries/sdl.h" // see note below
#include "lib/external_libraries/libsdl.h" // see note below
// note: we need the real SDL header - it defines SDL_USEREVENT, which is
// required for our HOTKEY event type definition. this is OK since

4
source/ps/Joystick.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -19,7 +19,7 @@
#include "Joystick.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "ps/CLogger.h"
#include "ps/ConfigDB.h"

4
source/ps/Joystick.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,7 +18,7 @@
#ifndef INCLUDED_JOYSTICK
#define INCLUDED_JOYSTICK
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
class CJoystick
{

4
source/ps/KeyName.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -21,7 +21,7 @@
#include "KeyName.h"
#include "CStr.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include <map>

2
source/ps/KeyName.h
View File

@ -19,7 +19,7 @@
#define INCLUDED_KEYNAME
// Need SDLK_* enum values.
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
class CStr8;

4
source/ps/ProfileViewer.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -32,7 +32,7 @@
#include "ps/Font.h"
#include "ps/Hotkey.h"
#include "ps/Profile.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/res/graphics/unifont.h"
#include "renderer/Renderer.h"
#include "scriptinterface/ScriptInterface.h"

4
source/ps/UserReport.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -22,7 +22,7 @@
#include "lib/timer.h"
#include "lib/utf8.h"
#include "lib/external_libraries/curl.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/external_libraries/zlib.h"
#include "lib/file/archive/stream.h"
#include "lib/sysdep/sysdep.h"

4
source/ps/VideoMode.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -23,7 +23,7 @@
#include "graphics/GameView.h"
#include "gui/GUIManager.h"
#include "lib/ogl.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/sysdep/gfx.h"
#include "ps/CConsole.h"
#include "ps/CLogger.h"

4
source/tools/atlas/GameInterface/GameLoop.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -31,7 +31,7 @@
#include "graphics/TextureManager.h"
#include "gui/GUIManager.h"
#include "lib/app_hooks.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/timer.h"
#include "ps/CLogger.h"
#include "ps/DllLoader.h"

4
source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -26,7 +26,7 @@
#include "graphics/GameView.h"
#include "graphics/ObjectManager.h"
#include "gui/GUIManager.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "maths/MathUtil.h"
#include "ps/CConsole.h"
#include "ps/Game.h"

4
source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2012 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -25,7 +25,7 @@
#include "graphics/CinemaTrack.h"
#include "graphics/GameView.h"
#include "gui/GUIManager.h"
#include "lib/external_libraries/sdl.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/sysdep/cpu.h"
#include "maths/MathUtil.h"
#include "ps/Game.h"