Changes for Haiku
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7451 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 91d0b4a32e8149a7ac8a858b90953c6cab822100 Former-commit-id: 9ea870c64a74fd84ef139b3a5585ac1b85b103b3
This commit is contained in:
parent
1cd7e732c3
commit
b6692918ee
4 changed files with 9 additions and 9 deletions
|
@ -111,12 +111,12 @@ IF(WIN32)
|
|||
TARGET_LINK_LIBRARIES(tgfclient winmm)
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(UNIX)
|
||||
IF(UNIX AND NOT HAIKU)
|
||||
ADD_X11_LIBRARY(tgfclient)
|
||||
IF(OPTION_XRANDR)
|
||||
ADD_XRANDR_LIBRARY(tgfclient)
|
||||
ENDIF(OPTION_XRANDR)
|
||||
ENDIF(UNIX)
|
||||
ENDIF(UNIX AND NOT HAIKU)
|
||||
|
||||
IF(UNIX)
|
||||
SD_INSTALL_FILES(LIB lib TARGETS tgfclient)
|
||||
|
|
|
@ -45,7 +45,7 @@ GfuiFontClass *gfuiFont[GFUI_FONT_NB];
|
|||
const char *keySize[4] = { "size big", "size large", "size medium", "size small" };
|
||||
|
||||
|
||||
#ifndef WIN32
|
||||
#if !defined(WIN32) && !defined(__HAIKU__)
|
||||
#if BYTE_ORDER == BIG_ENDIAN
|
||||
void swap32(unsigned int *p, unsigned int size)
|
||||
{
|
||||
|
@ -159,7 +159,7 @@ GfuiFontClass::GfuiFontClass(char *FileName)
|
|||
GfLogWarning( "Not all bytes are successfully read" );
|
||||
//GfLogDebug("Font(%s) : texW=%d, texH=%d\n", FileName, font->TexWidth, font->TexHeight);
|
||||
|
||||
#ifndef WIN32
|
||||
#if !defined(WIN32) && !defined(__HAIKU__)
|
||||
#if BYTE_ORDER == BIG_ENDIAN
|
||||
swap32((unsigned int *) font, 24);
|
||||
#endif
|
||||
|
@ -181,7 +181,7 @@ GfuiFontClass::GfuiFontClass(char *FileName)
|
|||
if( readSize <= 0 )
|
||||
GfLogWarning( "Not all bytes are successfully read" );
|
||||
|
||||
#ifndef WIN32
|
||||
#if !defined(WIN32) && !defined(__HAIKU__)
|
||||
#if BYTE_ORDER == BIG_ENDIAN
|
||||
swap32((unsigned int *)font->Char, sizeof(GLFONTCHAR) * Num);
|
||||
#endif
|
||||
|
|
|
@ -33,9 +33,9 @@ SET(SSGGRAPH_SOURCES grMoonpos.cpp
|
|||
ssggraph.cpp)
|
||||
|
||||
SET(SSGGRAPH_OTHER_SOURCES )
|
||||
IF(NOT APPLE)
|
||||
IF(NOT APPLE AND NOT HAIKU)
|
||||
SET(SSGGRAPH_HEADERS ${SSGGRAPH_HEADERS} grshader.h grshader.cpp)
|
||||
ENDIF(NOT APPLE)
|
||||
ENDIF(NOT APPLE AND NOT HAIKU)
|
||||
|
||||
ADD_INTERFACE_INCLUDEDIR()
|
||||
ADD_SDLIB_INCLUDEDIR(portability math tgf tgfclient robottools)
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <car.h> //tCarElt
|
||||
#include <raceman.h> //tSituation
|
||||
#include "grcam.h" //cGrPerspCamera
|
||||
#ifndef __APPLE__
|
||||
#if !defined(__APPLE__) && !defined(__HAIKU__)
|
||||
#include "grshader.h" //cGrShader
|
||||
#endif
|
||||
|
||||
|
@ -97,7 +97,7 @@ public:
|
|||
tdble py;
|
||||
tdble sx;
|
||||
tdble sy;
|
||||
#ifndef __APPLE__
|
||||
#if !defined(__APPLE__) && !defined(__HAIKU__)
|
||||
cgrShader *shader;
|
||||
#endif
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue