mirror of
https://github.com/aseprite/aseprite.git
synced 2025-04-16 05:42:32 +00:00
Fix some compilations problems in MinGW
Anyway without DirectX header files (ddraw.h specifically) we cannot compile Allegro source code with MinGW.
This commit is contained in:
parent
85523ba63a
commit
c3e583f927
@ -29,7 +29,9 @@
|
|||||||
/* a static auto config */
|
/* a static auto config */
|
||||||
/* older mingw's don't seem to have inttypes.h */
|
/* older mingw's don't seem to have inttypes.h */
|
||||||
/* #define ALLEGRO_HAVE_INTTYPES_H */
|
/* #define ALLEGRO_HAVE_INTTYPES_H */
|
||||||
|
#ifndef ALLEGRO_HAVE_STDINT_H
|
||||||
#define ALLEGRO_HAVE_STDINT_H 1
|
#define ALLEGRO_HAVE_STDINT_H 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* describe this platform */
|
/* describe this platform */
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
#include <iosfwd>
|
#include <iosfwd>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
namespace raster {
|
namespace raster {
|
||||||
class Image;
|
class Image;
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
#ifdef ALLEGRO_WINDOWS
|
#ifdef ALLEGRO_WINDOWS
|
||||||
#include <winalleg.h>
|
#include <winalleg.h>
|
||||||
|
|
||||||
#ifdef STRICT
|
#if defined STRICT || defined __GNUC__
|
||||||
typedef WNDPROC wndproc_t;
|
typedef WNDPROC wndproc_t;
|
||||||
#else
|
#else
|
||||||
typedef FARPROC wndproc_t;
|
typedef FARPROC wndproc_t;
|
||||||
|
@ -51,6 +51,7 @@
|
|||||||
#include "ui/ui.h"
|
#include "ui/ui.h"
|
||||||
|
|
||||||
#include <allegro.h>
|
#include <allegro.h>
|
||||||
|
#include <cstdio>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
// Size of the thumbnail in the screen (width x height), the really
|
// Size of the thumbnail in the screen (width x height), the really
|
||||||
@ -1108,7 +1109,7 @@ void Timeline::drawHeaderFrame(ui::Graphics* g, FrameNumber frame)
|
|||||||
|
|
||||||
// Draw the header for the layers.
|
// Draw the header for the layers.
|
||||||
char buf[256];
|
char buf[256];
|
||||||
sprintf(buf, "%d", frame+1);
|
std::sprintf(buf, "%d", frame+1);
|
||||||
drawPart(g, bounds, buf, m_timelineBoxStyle,
|
drawPart(g, bounds, buf, m_timelineBoxStyle,
|
||||||
is_active, is_hover, is_clicked);
|
is_active, is_hover, is_clicked);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user