Move common/2d/bitblt.c -> common/2d/bitblt.cpp
This commit is contained in:
parent
ff90315978
commit
c2895e5176
|
@ -601,7 +601,7 @@ class DXXArchive(DXXCommon):
|
||||||
target = 'dxx-common'
|
target = 'dxx-common'
|
||||||
__objects_common = DXXCommon.create_lazy_object_property([os.path.join(srcdir, f) for f in [
|
__objects_common = DXXCommon.create_lazy_object_property([os.path.join(srcdir, f) for f in [
|
||||||
'2d/2dsline.cpp',
|
'2d/2dsline.cpp',
|
||||||
'2d/bitblt.c',
|
'2d/bitblt.cpp',
|
||||||
'2d/bitmap.c',
|
'2d/bitmap.c',
|
||||||
'2d/box.c',
|
'2d/box.c',
|
||||||
'2d/canvas.c',
|
'2d/canvas.c',
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include "gr.h"
|
#include "gr.h"
|
||||||
#include "palette.h"
|
#include "palette.h"
|
||||||
#include "pstypes.h"
|
#include "pstypes.h"
|
||||||
|
#include "3d.h"
|
||||||
|
|
||||||
#ifndef GL_VERSION_1_1
|
#ifndef GL_VERSION_1_1
|
||||||
#ifdef GL_EXT_texture
|
#ifdef GL_EXT_texture
|
||||||
|
@ -49,6 +50,10 @@
|
||||||
#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
|
#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
/* we need to export ogl_texture for 2d/font.c */
|
/* we need to export ogl_texture for 2d/font.c */
|
||||||
typedef struct _ogl_texture {
|
typedef struct _ogl_texture {
|
||||||
GLuint handle;
|
GLuint handle;
|
||||||
|
@ -108,4 +113,8 @@ void ogl_toggle_depth_test(int enable);
|
||||||
void ogl_set_blending();
|
void ogl_set_blending();
|
||||||
int pow2ize(int x);//from ogl.c
|
int pow2ize(int x);//from ogl.c
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* _OGL_INIT_H_ */
|
#endif /* _OGL_INIT_H_ */
|
||||||
|
|
|
@ -22,6 +22,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
#include "pstypes.h"
|
#include "pstypes.h"
|
||||||
#include "gr.h"
|
#include "gr.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
void gr_rle_decode( ubyte * src, ubyte * dest );
|
void gr_rle_decode( ubyte * src, ubyte * dest );
|
||||||
int gr_rle_encode( int org_size, ubyte *src, ubyte *dest );
|
int gr_rle_encode( int org_size, ubyte *src, ubyte *dest );
|
||||||
int gr_rle_getsize( int org_size, ubyte *src );
|
int gr_rle_getsize( int org_size, ubyte *src );
|
||||||
|
@ -36,4 +40,8 @@ void rle_swap_0_255(grs_bitmap *bmp);
|
||||||
void rle_remap(grs_bitmap *bmp, ubyte *colormap);
|
void rle_remap(grs_bitmap *bmp, ubyte *colormap);
|
||||||
void gr_rle_expand_scanline_generic( grs_bitmap * dest, int dx, int dy, ubyte *src, int x1, int x2 );
|
void gr_rle_expand_scanline_generic( grs_bitmap * dest, int dx, int dy, ubyte *src, int x1, int x2 );
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue