mirror of
https://github.com/libretro/FBNeo.git
synced 2024-11-27 02:50:29 +00:00
Update MinGW 4.6.1 support to 4.7.1
This commit is contained in:
parent
22c7d87fad
commit
a673dc1b8a
4
makefile
4
makefile
@ -68,8 +68,8 @@ mingw345: FORCE
|
||||
mingw452: FORCE
|
||||
@$(MAKE) -s -f makefile.mingw GCC452=1
|
||||
|
||||
mingw461: FORCE
|
||||
@$(MAKE) -s -f makefile.mingw GCC461=1
|
||||
mingw471: FORCE
|
||||
@$(MAKE) -s -f makefile.mingw GCC471=1
|
||||
|
||||
sdl: FORCE
|
||||
@$(MAKE) -s -f makefile.sdl
|
||||
|
@ -81,8 +81,8 @@ endif
|
||||
ifdef GCC452
|
||||
objdir = obj/45/$(COMPILENAME)/
|
||||
endif
|
||||
ifdef GCC461
|
||||
objdir = obj/46/$(COMPILENAME)/
|
||||
ifdef GCC471
|
||||
objdir = obj/47/$(COMPILENAME)/
|
||||
endif
|
||||
|
||||
srcdir = src/
|
||||
@ -96,7 +96,7 @@ endif
|
||||
ifdef GCC452
|
||||
incdir = $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)dep/generated -I$(srcdir)dep/mingw/include -I$(srcdir)dep/mingw/include/directx9 -I$(srcdir)dep/mingw/include/xaudio2
|
||||
endif
|
||||
ifdef GCC461
|
||||
ifdef GCC471
|
||||
incdir = $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)dep/generated -I$(srcdir)dep/mingw/include -I$(srcdir)dep/mingw/include/directx9 -I$(srcdir)dep/mingw/include/xaudio2
|
||||
endif
|
||||
|
||||
@ -209,7 +209,7 @@ CXXFLAGS = -pipe \
|
||||
-Wno-sequence-point \
|
||||
$(DEF) $(incdir)
|
||||
endif
|
||||
ifdef GCC461
|
||||
ifdef GCC471
|
||||
CFLAGS = -pipe \
|
||||
-std=gnu99 -O1 \
|
||||
-mwindows \
|
||||
@ -362,8 +362,8 @@ endif
|
||||
ifdef GCC452
|
||||
@$(MAKE) -f makefile.mingw -s GCC452=1
|
||||
endif
|
||||
ifdef GCC461
|
||||
@$(MAKE) -f makefile.mingw -s GCC461=1
|
||||
ifdef GCC471
|
||||
@$(MAKE) -f makefile.mingw -s GCC471=1
|
||||
endif
|
||||
|
||||
else
|
||||
@ -375,8 +375,8 @@ endif
|
||||
ifdef GCC452
|
||||
@$(MAKE) -f makefile.mingw -s GCC452=1
|
||||
endif
|
||||
ifdef GCC461
|
||||
@$(MAKE) -f makefile.mingw -s GCC461=1
|
||||
ifdef GCC471
|
||||
@$(MAKE) -f makefile.mingw -s GCC471=1
|
||||
endif
|
||||
|
||||
endif
|
||||
@ -626,7 +626,7 @@ endif
|
||||
ifdef GCC452
|
||||
@windres $(DEF) $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F) $(foreach dir,$(alldir),--include-dir $(srcdir)$(dir))
|
||||
endif
|
||||
ifdef GCC461
|
||||
ifdef GCC471
|
||||
ifdef BUILD_X64_EXE
|
||||
@windres -F pe-x86-64 $(DEF) $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F) $(foreach dir,$(alldir),--include-dir $(srcdir)$(dir))
|
||||
else
|
||||
|
@ -1,5 +1,5 @@
|
||||
#include "burner.h"
|
||||
#include <string>
|
||||
#include <string.h>
|
||||
|
||||
#define MAX_LST_GAMES 25000
|
||||
#define MAX_LST_LINE_LEN 256
|
||||
|
Loading…
Reference in New Issue
Block a user