Skip to content

Commit 43a0115

Browse files
committed
bflibrary: Fixed missing config propagation
Config defines were used without including the file which creates these defines. Now the defines should work. Also small fix to mouse wheel events propagation.
1 parent 8dc404b commit 43a0115

11 files changed

Lines changed: 43 additions & 5 deletions

File tree

bflibrary/src/general/gflicrec.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
#include "bfflic.h"
2121

2222
#include <stdlib.h>
23+
24+
#if defined(HAVE_CONFIG_H)
25+
# include "bfconfig.h"
26+
#endif
27+
2328
#include "bffile.h"
2429
#include "bfmemut.h"
2530
#include "privbflog.h"

bflibrary/src/general/gmouse.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
/******************************************************************************/
2020
#include "bfmouse.h"
2121

22+
#if defined(HAVE_CONFIG_H)
23+
# include "bfconfig.h"
24+
#endif
25+
2226
#include "bfscreen.h"
2327
#include "bfplanar.h"
2428

bflibrary/src/general/gtext.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
#include <stdio.h>
2121
#include <limits.h>
2222
#include "bftext.h"
23+
24+
#if defined(HAVE_CONFIG_H)
25+
# include "bfconfig.h"
26+
#endif
27+
2328
#include "bfsprite.h"
2429
#include "bfscreen.h"
2530
#include "bffont.h"

bflibrary/src/general/poly.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@
2020
#include <assert.h>
2121
#include "poly.h"
2222

23+
#if defined(HAVE_CONFIG_H)
24+
# include "bfconfig.h"
25+
#endif
26+
2327
#include "poly_gp.h"
2428
#include "poly_trigp.h"
2529
#include "poly_trigr.h"
26-
#include "bfconfig.h"
2730
#include "bfgentab.h"
2831
#include "bfmemut.h"
2932
#include "bfpalette.h"

bflibrary/src/x86-win-sdl/slog.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
*/
1919
/******************************************************************************/
2020
#include <stdarg.h>
21-
#include "bfconfig.h"
2221
#include "bflog.h"
2322

23+
#if defined(HAVE_CONFIG_H)
24+
# include "bfconfig.h"
25+
#endif
26+
2427
#include "bfmemut.h"
2528
#include "bfstrut.h"
2629
#include "bffile.h"

bflibrary/src/x86-win-sdl/smouse.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
#include <SDL/SDL.h>
2222
#include "bfmouse.h"
2323

24+
#if defined(HAVE_CONFIG_H)
25+
# include "bfconfig.h"
26+
#endif
27+
2428
#include "mshandler.hpp"
2529
#include "bfscreen.h"
2630
#include "bfsprite.h"

bflibrary/src/x86-win-sdl/sscreen.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@
2020
#include <assert.h>
2121
#include <SDL/SDL.h>
2222
#include <SDL/SDL_syswm.h>
23-
#include "bfconfig.h"
2423
#include "bfscreen.h"
2524

25+
#if defined(HAVE_CONFIG_H)
26+
# include "bfconfig.h"
27+
#endif
28+
2629
#include "bfscrsurf.h"
2730
#include "bfpalette.h"
2831
#include "bfmemut.h"

bflibrary/src/x86-win-sdl2/slog.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
*/
1919
/******************************************************************************/
2020
#include <stdarg.h>
21-
#include "bfconfig.h"
2221
#include "bflog.h"
2322

23+
#if defined(HAVE_CONFIG_H)
24+
# include "bfconfig.h"
25+
#endif
26+
2427
#include "bfmemut.h"
2528
#include "bfstrut.h"
2629
#include "bffile.h"

bflibrary/src/x86-win-sdl2/smouse.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
#include <SDL.h>
2222
#include "bfmouse.h"
2323

24+
#if defined(HAVE_CONFIG_H)
25+
# include "bfconfig.h"
26+
#endif
27+
2428
#include "mshandler.hpp"
2529
#include "bfscreen.h"
2630
#include "bfsprite.h"

bflibrary/src/x86-win-sdl2/sscreen.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@
2020
#include <assert.h>
2121
#include <SDL.h>
2222
#include <SDL_syswm.h>
23-
#include "bfconfig.h"
2423
#include "bfscreen.h"
2524

25+
#if defined(HAVE_CONFIG_H)
26+
# include "bfconfig.h"
27+
#endif
28+
2629
#include "bfscrsurf.h"
2730
#include "bfpalette.h"
2831
#include "bfmemut.h"

0 commit comments

Comments
 (0)