matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Visual Studio and MinGW comapatbility

Browse Source
This commit is contained in:
Simon 2010-11-06 17:42:22 +00:00
parent c5df30d90b
commit 43cbb294ef
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/graphics.h
View File

@ -63,13 +63,13 @@ int draw_tool_xy(pixel *vid_buf, int x, int y, int b, unsigned pc);
void draw_menu(pixel *vid_buf, int i, int hover); void draw_menu(pixel *vid_buf, int i, int hover);
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a); _inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a);
#else #else
extern inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a); extern inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a);
#endif #endif
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a); _inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a);
#else #else
extern inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a); extern inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a);
@ -99,7 +99,7 @@ int textwidthx(char *s, int w);
int textposxy(char *s, int width, int w, int h); int textposxy(char *s, int width, int w, int h);
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a); _inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a);
#else #else
void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a); void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a);

6
includes/misc.h
View File

@ -21,19 +21,19 @@ __asm__ __volatile ("cpuid":\
static char hex[] = "0123456789ABCDEF"; static char hex[] = "0123456789ABCDEF";
//Signum function //Signum function
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
extern _inline int isign(float i); extern _inline int isign(float i);
#else #else
extern inline int isign(float i); extern inline int isign(float i);
#endif #endif
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
extern _inline unsigned clamp_flt(float f, float min, float max); extern _inline unsigned clamp_flt(float f, float min, float max);
#else #else
extern inline unsigned clamp_flt(float f, float min, float max); extern inline unsigned clamp_flt(float f, float min, float max);
#endif #endif
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
extern _inline float restrict_flt(float f, float min, float max); extern _inline float restrict_flt(float f, float min, float max);
#else #else
extern inline float restrict_flt(float f, float min, float max); extern inline float restrict_flt(float f, float min, float max);

10
includes/powder.h
View File

@ -391,25 +391,25 @@ int try_move(int i, int x, int y, int nx, int ny);
void kill_part(int i); void kill_part(int i);
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
extern _inline int create_part(int p, int x, int y, int t); extern _inline int create_part(int p, int x, int y, int t);
#else #else
extern inline int create_part(int p, int x, int y, int t); extern inline int create_part(int p, int x, int y, int t);
#endif #endif
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
extern _inline void delete_part(int x, int y); extern _inline void delete_part(int x, int y);
#else #else
extern inline void delete_part(int x, int y); extern inline void delete_part(int x, int y);
#endif #endif
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
extern _inline int is_wire(int x, int y); extern _inline int is_wire(int x, int y);
#else #else
extern inline int is_wire(int x, int y); extern inline int is_wire(int x, int y);
#endif #endif
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
extern _inline int is_wire_off(int x, int y); extern _inline int is_wire_off(int x, int y);
#else #else
extern inline int is_wire_off(int x, int y); extern inline int is_wire_off(int x, int y);
@ -417,7 +417,7 @@ extern inline int is_wire_off(int x, int y);
void set_emap(int x, int y); void set_emap(int x, int y);
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline int parts_avg(int ci, int ni); _inline int parts_avg(int ci, int ni);
#else #else
int parts_avg(int ci, int ni); int parts_avg(int ci, int ni);

6
src/graphics.c
View File

@ -757,7 +757,7 @@ void draw_menu(pixel *vid_buf, int i, int hover)
} }
} }
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a) _inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
#else #else
inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a) inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
@ -776,7 +776,7 @@ inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
vid[y*(XRES+BARSIZE)+x] = PIXRGB(r,g,b); vid[y*(XRES+BARSIZE)+x] = PIXRGB(r,g,b);
} }
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a) _inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
#else #else
inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a) inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
@ -1054,7 +1054,7 @@ int textposxy(char *s, int width, int w, int h)
return n; return n;
} }
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a) _inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
#else #else
inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a) inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a)

6
src/misc.c
View File

@ -7,7 +7,7 @@
#include "graphics.h" #include "graphics.h"
//Signum function //Signum function
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline int isign(float i) _inline int isign(float i)
#else #else
inline int isign(float i) inline int isign(float i)
@ -20,7 +20,7 @@ inline int isign(float i)
return 0; return 0;
} }
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline unsigned clamp_flt(float f, float min, float max) _inline unsigned clamp_flt(float f, float min, float max)
#else #else
inline unsigned clamp_flt(float f, float min, float max) inline unsigned clamp_flt(float f, float min, float max)
@ -33,7 +33,7 @@ inline unsigned clamp_flt(float f, float min, float max)
return (int)(255.0f*(f-min)/(max-min)); return (int)(255.0f*(f-min)/(max-min));
} }
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline float restrict_flt(float f, float min, float max) _inline float restrict_flt(float f, float min, float max)
#else #else
inline float restrict_flt(float f, float min, float max) inline float restrict_flt(float f, float min, float max)

10
src/powder.c
View File

@ -360,7 +360,7 @@ void kill_part(int i)
pfree = i; pfree = i;
} }
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline int create_part(int p, int x, int y, int t) _inline int create_part(int p, int x, int y, int t)
#else #else
inline int create_part(int p, int x, int y, int t) inline int create_part(int p, int x, int y, int t)
@ -656,7 +656,7 @@ static void create_cherenkov_photon(int pp)
parts[i].vy *= r; parts[i].vy *= r;
} }
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline void delete_part(int x, int y) _inline void delete_part(int x, int y)
#else #else
inline void delete_part(int x, int y) inline void delete_part(int x, int y)
@ -674,7 +674,7 @@ inline void delete_part(int x, int y)
pmap[y][x] = 0; // just in case pmap[y][x] = 0; // just in case
} }
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline int is_wire(int x, int y) _inline int is_wire(int x, int y)
#else #else
inline int is_wire(int x, int y) inline int is_wire(int x, int y)
@ -683,7 +683,7 @@ inline int is_wire(int x, int y)
return bmap[y][x]==6 || bmap[y][x]==7 || bmap[y][x]==3 || bmap[y][x]==8 || bmap[y][x]==11 || bmap[y][x]==12; return bmap[y][x]==6 || bmap[y][x]==7 || bmap[y][x]==3 || bmap[y][x]==8 || bmap[y][x]==11 || bmap[y][x]==12;
} }
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline int is_wire_off(int x, int y) _inline int is_wire_off(int x, int y)
#else #else
inline int is_wire_off(int x, int y) inline int is_wire_off(int x, int y)
@ -774,7 +774,7 @@ void set_emap(int x, int y)
} }
} }
#ifdef WIN32 #if defined(WIN32) && !defined(__GNUC__)
_inline int parts_avg(int ci, int ni) _inline int parts_avg(int ci, int ni)
#else #else
inline int parts_avg(int ci, int ni) inline int parts_avg(int ci, int ni)