- debian related changes
This commit is contained in:
Mark Vejvoda
parent
c11266d529
commit
bb16ed2a65
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.1 KiB |
File diff suppressed because it is too large
Load Diff
|
|
@ -140,10 +140,19 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
|
|||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
|
||||
|
||||
IF(EXISTS ${HELP2MAN})
|
||||
MESSAGE("-- Found help2man: ${HELP2MAN}")
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}]")
|
||||
|
||||
IF(EXISTS ${XVFB_EXEC})
|
||||
MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
|
||||
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
ELSE()
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
|
|
|
|||
|
|
@ -191,8 +191,6 @@ IF(BUILD_MEGAGLEST)
|
|||
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
|
||||
ENDIF()
|
||||
|
||||
FIND_PROGRAM(HELP2MAN "help2man")
|
||||
|
||||
SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
||||
|
||||
ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
|
|
@ -207,9 +205,18 @@ IF(BUILD_MEGAGLEST)
|
|||
|
||||
IF(EXISTS ${HELP2MAN})
|
||||
MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}]")
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
|
||||
IF(EXISTS ${XVFB_EXEC})
|
||||
MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
|
||||
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
ELSE()
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
|
|
|
|||
|
|
@ -135,10 +135,19 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
|
|||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
|
||||
|
||||
IF(EXISTS ${HELP2MAN})
|
||||
MESSAGE("-- Found help2man: ${HELP2MAN}")
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}]")
|
||||
|
||||
IF(EXISTS ${XVFB_EXEC})
|
||||
MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
|
||||
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
ELSE()
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
|
|
|
|||
|
|
@ -21,10 +21,13 @@ using std::string;
|
|||
using Shared::Platform::uint8;
|
||||
using Shared::Platform::uint64;
|
||||
|
||||
struct SDL_Surface;
|
||||
|
||||
namespace Shared{ namespace Graphics{
|
||||
|
||||
class TextureParams;
|
||||
|
||||
|
||||
// =====================================================
|
||||
// class Texture
|
||||
// =====================================================
|
||||
|
|
@ -138,6 +141,8 @@ public:
|
|||
virtual int getTextureHeight() const {return pixmap.getH();}
|
||||
|
||||
virtual uint32 getCRC() { return pixmap.getCRC()->getSum(); }
|
||||
|
||||
SDL_Surface* CreateSDLSurface(bool newPixelData) const;
|
||||
};
|
||||
|
||||
// =====================================================
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
#include "texture.h"
|
||||
#include "util.h"
|
||||
|
||||
#include <SDL.h>
|
||||
#include "leak_dumper.h"
|
||||
|
||||
using namespace Shared::Util;
|
||||
|
|
@ -38,6 +38,7 @@ Texture::Texture() {
|
|||
forceCompressionDisabled=false;
|
||||
}
|
||||
|
||||
|
||||
// =====================================================
|
||||
// class Texture1D
|
||||
// =====================================================
|
||||
|
|
@ -66,6 +67,28 @@ void Texture1D::deletePixels() {
|
|||
// class Texture2D
|
||||
// =====================================================
|
||||
|
||||
SDL_Surface* Texture2D::CreateSDLSurface(bool newPixelData) const {
|
||||
SDL_Surface* surface = NULL;
|
||||
|
||||
unsigned char* surfData = NULL;
|
||||
if (newPixelData == true) {
|
||||
// copy pixel data
|
||||
surfData = new unsigned char[pixmap.getW() * pixmap.getH() * pixmap.getComponents()];
|
||||
memcpy(surfData, pixmap.getPixels(), pixmap.getW() * pixmap.getH() * pixmap.getComponents());
|
||||
} else {
|
||||
surfData = pixmap.getPixels();
|
||||
}
|
||||
|
||||
// This will only work with 24bit RGB and 32bit RGBA pictures
|
||||
surface = SDL_CreateRGBSurfaceFrom(surfData, pixmap.getW(), pixmap.getH(), 8 * pixmap.getComponents(), pixmap.getW() * pixmap.getComponents(), 0x000000FF, 0x0000FF00, 0x00FF0000, (pixmap.getComponents() == 4) ? 0xFF000000 : 0);
|
||||
if ((surface == NULL) && newPixelData == true) {
|
||||
// cleanup when we failed to the create surface
|
||||
delete[] surfData;
|
||||
}
|
||||
|
||||
return surface;
|
||||
}
|
||||
|
||||
void Texture2D::load(const string &path){
|
||||
this->path= path;
|
||||
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] this->path = [%s]\n",__FILE__,__FUNCTION__,__LINE__,this->path.c_str());
|
||||
|
|
|
|||
|
|
@ -20,11 +20,16 @@
|
|||
#include <vector>
|
||||
//#include <SDL_image.h>
|
||||
#include "model.h"
|
||||
#include "texture.h"
|
||||
#include "graphics_interface.h"
|
||||
#include "graphics_factory.h"
|
||||
#include "platform_common.h"
|
||||
#include "leak_dumper.h"
|
||||
|
||||
using namespace Shared::Graphics::Gl;
|
||||
using namespace Shared::Util;
|
||||
using namespace Shared::Graphics;
|
||||
using namespace Shared::PlatformCommon;
|
||||
|
||||
namespace Shared{ namespace Platform{
|
||||
|
||||
|
|
@ -72,14 +77,28 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool
|
|||
#ifndef WIN32
|
||||
string mg_icon_file = "";
|
||||
#if defined(CUSTOM_DATA_INSTALL_PATH_VALUE)
|
||||
if(fileExists(CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.bmp")) {
|
||||
if(fileExists(CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.png")) {
|
||||
mg_icon_file = CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.png";
|
||||
}
|
||||
else if(fileExists(CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.bmp")) {
|
||||
mg_icon_file = CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.bmp";
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
if(mg_icon_file == "" && fileExists("megaglest.bmp")) {
|
||||
if(mg_icon_file == "" && fileExists("megaglest.png")) {
|
||||
mg_icon_file = "megaglest.png";
|
||||
}
|
||||
else if(mg_icon_file == "" && fileExists("megaglest.bmp")) {
|
||||
mg_icon_file = "megaglest.bmp";
|
||||
}
|
||||
else if(mg_icon_file == "" && fileExists("/usr/share/pixmaps/megaglest.png")) {
|
||||
mg_icon_file = "/usr/share/pixmaps/megaglest.png";
|
||||
}
|
||||
else if(mg_icon_file == "" && fileExists("/usr/share/pixmaps/megaglest.bmp")) {
|
||||
mg_icon_file = "/usr/share/pixmaps/megaglest.bmp";
|
||||
}
|
||||
|
||||
if(mg_icon_file != "") {
|
||||
|
||||
if(icon != NULL) {
|
||||
|
|
@ -87,7 +106,17 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool
|
|||
icon = NULL;
|
||||
}
|
||||
|
||||
icon = SDL_LoadBMP(mg_icon_file.c_str());
|
||||
//printf("Loading icon [%s]\n",mg_icon_file.c_str());
|
||||
if(extractExtension(mg_icon_file) == "bmp") {
|
||||
icon = SDL_LoadBMP(mg_icon_file.c_str());
|
||||
}
|
||||
else {
|
||||
Texture2D *texture2D = GraphicsInterface::getInstance().getFactory()->newTexture2D();
|
||||
texture2D->load(mg_icon_file);
|
||||
icon = texture2D->CreateSDLSurface(true);
|
||||
delete texture2D;
|
||||
}
|
||||
|
||||
//SDL_Surface *icon = IMG_Load("megaglest.ico");
|
||||
|
||||
|
||||
|
|
@ -105,6 +134,10 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool
|
|||
printf("Error: %s\n", SDL_GetError());
|
||||
}
|
||||
if(icon != NULL) {
|
||||
|
||||
//uint32 colorkey = SDL_MapRGB(icon->format, 255, 0, 255);
|
||||
//SDL_SetColorKey(icon, SDL_SRCCOLORKEY, colorkey);
|
||||
|
||||
SDL_WM_SetIcon(icon, NULL);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue