Commit b425e8c8 authored by Gerhard Stein's avatar Gerhard Stein

Adaptations for the separated GsKit

parent 997fe7a6
......@@ -138,7 +138,7 @@ configure_file(README.in README)
# main includes
INCLUDE_DIRECTORIES(src)
INCLUDE_DIRECTORIES(src/lib)
INCLUDE_DIRECTORIES(lib/GsKit)
file(GLOB ALL_SRCS_PART_ROOT src/*.c* src/*.h*)
#file(GLOB_RECURSE ALL_SRCS_PART_LIB src/lib/*.c* src/lib/*.h*)
......@@ -363,7 +363,7 @@ else(SDL2_FOUND)
endif(SDL2_FOUND)
# Add GsKit
add_subdirectory("src/lib")
add_subdirectory("lib/GsKit")
#MESSAGE( "BUILD_TARGET = ${BUILD_TARGET}" )
......
......@@ -9,7 +9,7 @@
#include "graphics/GsGraphics.h"
#include "sdl/extensions.h"
#include <base/video/CVideoDriver.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include <base/utils/StringUtils.h>
#include <cassert>
......
......@@ -10,7 +10,7 @@
#include <SDL_thread.h>
#include "ThreadPool.h"
#include <base/Debug.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "ReadWriteLock.h" // for ScopedLock
......
......@@ -9,7 +9,7 @@
#include "fileio/ResourceMgmt.h"
#include <base/FindFile.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "sdl/sound/CSound.h"
#include <SDL.h>
......
......@@ -15,7 +15,7 @@
*/
#include "common/CBehaviorEngine.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
void CBehaviorEngine::setMessage(const std::string &name, const std::string &message)
{
......
......@@ -28,7 +28,7 @@
#include <base/GsEvent.h>
#include "common/options.h"
#include <lib/base/GsEvent.h>
#include <base/GsEvent.h>
#include "CSingleton.h"
......
......@@ -8,9 +8,9 @@
#include "CMap.h"
#include "common/CBehaviorEngine.h"
#include <base/FindFile.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/video/CVideoDriver.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include "graphics/GsGraphics.h"
#include <iostream>
#include <fstream>
......
......@@ -12,7 +12,7 @@
#include <string>
#include <vector>
#include <list>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include "graphics/GsTilemap.h"
......
......@@ -10,7 +10,7 @@
#include "CSpriteObject.h"
#include "engine/spritedefines.h"
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
/*
* \brief Performs collision without bouncing box recalculation
......
......@@ -6,7 +6,7 @@
*/
#include "CPhysicsSettings.h"
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
CPhysicsSettings::CPhysicsSettings()
{
......
......@@ -5,11 +5,11 @@
* Author: gerstrong
*/
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/FindFile.h>
#include "ConfigHandler.h"
#include "CSettings.h"
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include "sdl/sound/CSound.h"
#include <base/video/CVideoDriver.h>
#include "common/options.h"
......
......@@ -7,7 +7,7 @@
#include "engine/spritedefines.h"
#include "CSpriteObject.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/video/CVideoDriver.h>
int CSpriteObject::m_number_of_objects = 0; // The current number of total objects we have within the game!
......
......@@ -12,7 +12,7 @@
#ifndef __CSpriteObject_H_
#define __CSpriteObject_H_
#include <lib/base/GsEvent.h>
#include <base/GsEvent.h>
#include "ActionFormat.h"
#include "CVec.h"
......
......@@ -10,7 +10,7 @@
*/
#include "CCamera.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/video/CVideoDriver.h>
#include <base/CInput.h>
#include "engine/spritedefines.h"
......
......@@ -11,7 +11,7 @@
#include "CMessages.h"
//#include "StringUtils.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "common/CBehaviorEngine.h"
CMessages::CMessages(unsigned char *p_exebuf, char episode, int version) :
......
......@@ -14,7 +14,7 @@
//#include "sdl/CVideoDriver.h"
#include "sdl/music/CMusic.h"
#include "graphics/effects/CDimDark.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "CMapPlayGalaxy.h"
......
......@@ -2,7 +2,7 @@
#include <base/GsTimer.h>
#include <base/GsApp.h>
#include <base/utils/StringUtils.h>
#include <lib/widgets/GsMenuController.h>
#include <widgets/GsMenuController.h>
#include "CResourceLoader.h"
#include "GalaxyEngine.h"
......
......@@ -18,7 +18,7 @@
#include "fileio.h"
#include <base/video/CVideoDriver.h>
#include "sdl/music/CMusic.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "engine/CCamera.h"
/// AI Headers
......
......@@ -16,9 +16,9 @@
#include "sdl/sound/CSound.h"
#include "graphics/effects/CColorMerge.h"
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include "CVec.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "../dialog/CMessageBoxBitmapGalaxy.h"
......
......@@ -6,7 +6,7 @@
*/
#include "CPlatform.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/video/CVideoDriver.h>
namespace galaxy {
......
......@@ -9,7 +9,7 @@
#include "engine/keen/menu/CSelectionMenu.h"
#include "common/CSettings.h"
#include <base/video/CVideoDriver.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include "common/CBehaviorEngine.h"
#include "engine/CEvent.h"
#include <list>
......
......@@ -5,7 +5,7 @@
#include "widgets/Button.h"
#include <lib/widgets/GsMenuController.h>
#include <widgets/GsMenuController.h>
class GalaxyMenu : public CBaseMenu
{
......
......@@ -5,7 +5,7 @@
* Author: gerstrong
*/
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include <widgets/GsButton.h>
#include <widgets/GsMenuController.h>
......
......@@ -7,7 +7,7 @@
#include <fstream>
#include "CAudioGalaxy.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/FindFile.h>
#include "fileio/ResourceMgmt.h"
#include "sdl/sound/CSound.h"
......
......@@ -18,7 +18,7 @@
#include "common/CBehaviorEngine.h"
#include "fileio/compression/CHuffman.h"
#include <base/FindFile.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/utils/StringUtils.h>
#include <base/video/CVideoDriver.h>
#include "fileio/CTileLoader.h"
......
......@@ -8,7 +8,7 @@
#include "CAbout.h"
#include <base/FindFile.h>
#include <base/CInput.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "fileio/CExeFile.h"
#include "graphics/GsGraphics.h"
#include <base/video/CVideoDriver.h>
......
......@@ -6,7 +6,7 @@
*/
#include "CAudioVorticon.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/FindFile.h>
#include "fileio/ResourceMgmt.h"
#include <fstream>
......
......@@ -12,7 +12,7 @@
#include <base/video/CVideoDriver.h>
#include "fileio/TypeDefinitions.h"
#include "common/CBehaviorEngine.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "engine/CPlanes.h"
#include <base/FindFile.h>
#include <SDL.h>
......
......@@ -7,7 +7,7 @@
#include "COrderingInfo.h"
#include <base/CInput.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/video/CVideoDriver.h>
#include <graphics/GsGraphics.h>
......
......@@ -8,7 +8,7 @@
*/
#include "CTitle.h"
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include <base/video/CVideoDriver.h>
//#include "ai/CEGABitmap.h"
#include "graphics/effects/CColorMerge.h"
......
......@@ -7,7 +7,7 @@
#include "CBridges.h"
#include "engine/spritedefines.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
unsigned int CBridges::m_bgtile = 0;
......
......@@ -4,7 +4,7 @@
#include "engine/spritedefines.h"
#include "sdl/sound/CSound.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "graphics/effects/CVibrate.h"
#include "common/CBehaviorEngine.h"
......
......@@ -7,7 +7,7 @@
#include "CVorticonSpriteObjectAI.h"
//#include "sdl/CVideoDriver.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "CMeep.h"
......
......@@ -7,7 +7,7 @@
#include "CEndingEp1.h"
#include <base/utils/StringUtils.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include <base/CInput.h>
#include "graphics/GsGraphics.h"
#include "../CVorticonMapLoader.h"
......
......@@ -7,11 +7,11 @@
#include "CEndingEp2.h"
#include <base/utils/StringUtils.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include <base/CInput.h>
#include "graphics/GsGraphics.h"
#include "../CVorticonMapLoader.h"
#include "../common/Playerdefines.h"
#include "common/Playerdefines.h"
const int LIMPSHOME_X = 0;
const int LIMPSHOME_Y = 300;
......
......@@ -12,7 +12,7 @@
#include "common/CMap.h"
#include "../ai/CPlayer.h"
#include "../dialog/CMessageBoxVort.h"
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include <vector>
#include <list>
#include <SDL.h>
......
......@@ -7,7 +7,7 @@
#include "CFinale.h"
//#include "sdl/CVideoDriver.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/FindFile.h>
#include <fstream>
......
......@@ -7,7 +7,7 @@
#include "CFinaleStaticScene.h"
#include <base/video/CVideoDriver.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include "sdl/sound/CSound.h"
#include "graphics/GsGraphics.h"
//#include "sdl/video/scalers/CScaler.h"
......
......@@ -9,7 +9,7 @@
#include "CSelectionMenu.h"
#include "common/CSettings.h"
#include <base/video/CVideoDriver.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include "common/CBehaviorEngine.h"
#include "engine/CEvent.h"
#include "VorticonMenu.h"
......
......@@ -5,7 +5,7 @@
* Author: gerstrong
*/
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include <widgets/GsButton.h>
#include <widgets/GsMenuController.h>
......
......@@ -3,8 +3,8 @@
#include <widgets/GsBaseMenu.h>
#include <lib/widgets/GsMenuController.h>
#include <lib/base/video/CVideoDriver.h>
#include <widgets/GsMenuController.h>
#include <base/video/CVideoDriver.h>
class VorticonMenu : public CBaseMenu
......
......@@ -9,7 +9,7 @@
#include <graphics/GsGraphics.h>
#include <base/CInput.h>
#include <base/video/CVideoDriver.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
namespace vorticon
......
......@@ -8,7 +8,7 @@
#include <graphics/GsGraphics.h>
#include <base/CInput.h>
#include <base/video/CVideoDriver.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include <base/utils/StringUtils.h>
#include "NumberControl.h"
......
......@@ -8,7 +8,7 @@
#ifndef __VORTICONNUMBERCONTROL_H_
#define __VORTICONNUMBERCONTROL_H_
#include <lib/widgets/GsNumberControl.h>
#include <widgets/GsNumberControl.h>
#include <string>
#include <graphics/GsSurface.h>
......
......@@ -6,7 +6,7 @@
*
*/
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include <base/video/CVideoDriver.h>
#include <base/CInput.h>
#include <widgets/GsMenuController.h>
......
......@@ -31,7 +31,7 @@
#include <list>
#include <memory>
#include "../core/mode/CGameMode.h"
#include "core/mode/CGameMode.h"
const int WORLD_MAP_LEVEL_VORTICON = 80;
......
......@@ -6,7 +6,7 @@
*/
#include "CPlayGameVorticon.h"
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include <base/CInput.h>
#include "sdl/sound/CSound.h"
#include <base/video/CVideoDriver.h>
......
......@@ -10,7 +10,7 @@
#include <base/video/CVideoDriver.h>
#include "sdl/sound/CSound.h"
#include "fileio.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/utils/StringUtils.h>
#include <base/Debug.h>
#include <base/FindFile.h>
......
......@@ -12,7 +12,7 @@
#include <fstream>
//#include "StringUtils.h"
#include <base/FindFile.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "fileio/ResourceMgmt.h"
CExeFile::CExeFile() :
......
......@@ -11,7 +11,7 @@
#include <iostream>
#include <base/FindFile.h>
//#include "StringUtils.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "fileio/ResourceMgmt.h"
#include "common/CBehaviorEngine.h"
......
......@@ -12,7 +12,7 @@
#include <fstream>
#include <base/FindFile.h>
//#include "../StringUtils.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
/**
* \brief given a text line(string) with various items to patch, it will read of those
......
......@@ -14,7 +14,7 @@
#include <iostream>
#include <fstream>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/utils/StringUtils.h>
#include "fileio/TypeDefinitions.h"
#include "CSingleton.h"
......
......@@ -10,7 +10,7 @@
#include "ResourceMgmt.h"
#include <base/FindFile.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
const std::string GLOBAL_DIR = "global";
......
......@@ -6,8 +6,8 @@
*/
#include "CCarmack.h"
#include <lib/base/GsLogging.h>
#include <lib/base/utils/StringUtils.h>
#include <base/GsLogging.h>
#include <base/utils/StringUtils.h>
CCarmack::CCarmack()
{
......
......@@ -8,7 +8,7 @@
*/
#include "../../fileio.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#define SGRLE_RLEMARKERNEW 0xFE
#define SGRLE_RLEMARKEROLD 255
......
......@@ -2,7 +2,7 @@
This file contains the functions which decompress the graphics
data from Keen 1.
*/
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <cstdio>
#define LZ_STARTBITS 9
......
......@@ -16,7 +16,7 @@
#include <base/video/GsEffectController.h>
#include <graphics/GsSurface.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
class CFlash : public CEffects
{
......
......@@ -12,7 +12,7 @@
#include "CPixelate.h"
#include <base/video/CVideoDriver.h>
#include <base/CInput.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
#include "graphics/GsGraphics.h"
......
......@@ -12,7 +12,7 @@
#include <base/video/GsEffectController.h>
#include <lib/base/GsTimer.h>
#include <base/GsTimer.h>
class CVibrate : public CEffects
{
......
......@@ -39,7 +39,7 @@
#include <base/FindFile.h>
#include <base/GsApp.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "ThreadPool.h"
#include "common/CGameLauncher.h"
......
......@@ -10,7 +10,7 @@
#include "extensions.h"
#include <base/video/CVideoDriver.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <cstring>
#include <cstdio>
......
......@@ -11,7 +11,7 @@
#include "fileio/ResourceMgmt.h"
#include "fileio/compression/CHuffman.h"
#include <base/FindFile.h>
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <fstream>
#include <string>
#include <cassert>
......
......@@ -9,7 +9,7 @@
#include "sdl/sound/Sampling.h"
//#include "StringUtils.h"
#include "CMusic.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include <base/FindFile.h>
#include "fileio/ResourceMgmt.h"
#include "fileio/compression/CHuffman.h"
......
......@@ -12,7 +12,7 @@
#include <base/FindFile.h>
#include "sdl/sound/Sampling.h"
#include "fileio/ResourceMgmt.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
COGGPlayer::COGGPlayer(const SDL_AudioSpec& AudioSpec) :
......
......@@ -8,7 +8,7 @@
#include "CSound.h"
#include "fileio.h"
#include "fileio/ResourceMgmt.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
//#include "StringUtils.h"
#include <base/FindFile.h>
#include "sdl/music/CMusic.h"
......
......@@ -9,7 +9,7 @@
#include <fstream>
#include <vector>
#include "CSoundSlot.h"
#include <lib/base/GsLogging.h>
#include <base/GsLogging.h>
#include "fileio.h"
#include "fileio/ResourceMgmt.h"
#include "fileio/TypeDefinitions.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment