libretro/FBNeo
1
0
Fork 0
mirror of https://github.com/libretro/FBNeo.git synced 2024-11-23 08:59:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update MinGW 4.6.1 support to 4.7.1

Browse Source
This commit is contained in:
Barry Harris 2012-11-16 20:52:52 +00:00
parent 22c7d87fad
commit a673dc1b8a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -68,8 +68,8 @@ mingw345: FORCE
mingw452: FORCE mingw452: FORCE
@$(MAKE) -s -f makefile.mingw GCC452=1 @$(MAKE) -s -f makefile.mingw GCC452=1
mingw461: FORCE mingw471: FORCE
@$(MAKE) -s -f makefile.mingw GCC461=1 @$(MAKE) -s -f makefile.mingw GCC471=1
sdl: FORCE sdl: FORCE
@$(MAKE) -s -f makefile.sdl @$(MAKE) -s -f makefile.sdl

18
makefile.mingw
View File

@ -81,8 +81,8 @@ endif
ifdef GCC452 ifdef GCC452
objdir = obj/45/$(COMPILENAME)/ objdir = obj/45/$(COMPILENAME)/
endif endif
ifdef GCC461 ifdef GCC471
objdir = obj/46/$(COMPILENAME)/ objdir = obj/47/$(COMPILENAME)/
endif endif
srcdir = src/ srcdir = src/
@ -96,7 +96,7 @@ endif
ifdef GCC452 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 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 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 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 endif
@ -209,7 +209,7 @@ CXXFLAGS = -pipe \
-Wno-sequence-point \ -Wno-sequence-point \
$(DEF) $(incdir) $(DEF) $(incdir)
endif endif
ifdef GCC461 ifdef GCC471
CFLAGS = -pipe \ CFLAGS = -pipe \
-std=gnu99 -O1 \ -std=gnu99 -O1 \
-mwindows \ -mwindows \
@ -362,8 +362,8 @@ endif
ifdef GCC452 ifdef GCC452
@$(MAKE) -f makefile.mingw -s GCC452=1 @$(MAKE) -f makefile.mingw -s GCC452=1
endif endif
ifdef GCC461 ifdef GCC471
@$(MAKE) -f makefile.mingw -s GCC461=1 @$(MAKE) -f makefile.mingw -s GCC471=1
endif endif
else else
@ -375,8 +375,8 @@ endif
ifdef GCC452 ifdef GCC452
@$(MAKE) -f makefile.mingw -s GCC452=1 @$(MAKE) -f makefile.mingw -s GCC452=1
endif endif
ifdef GCC461 ifdef GCC471
@$(MAKE) -f makefile.mingw -s GCC461=1 @$(MAKE) -f makefile.mingw -s GCC471=1
endif endif
endif endif
@ -626,7 +626,7 @@ endif
ifdef GCC452 ifdef GCC452
@windres $(DEF) $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F) $(foreach dir,$(alldir),--include-dir $(srcdir)$(dir)) @windres $(DEF) $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F) $(foreach dir,$(alldir),--include-dir $(srcdir)$(dir))
endif endif
ifdef GCC461 ifdef GCC471
ifdef BUILD_X64_EXE ifdef BUILD_X64_EXE
@windres -F pe-x86-64 $(DEF) $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F) $(foreach dir,$(alldir),--include-dir $(srcdir)$(dir)) @windres -F pe-x86-64 $(DEF) $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F) $(foreach dir,$(alldir),--include-dir $(srcdir)$(dir))
else else

2
src/burner/win32/localise_gamelist.cpp
View File

@ -1,5 +1,5 @@
#include "burner.h" #include "burner.h"
#include <string> #include <string.h>
#define MAX_LST_GAMES 25000 #define MAX_LST_GAMES 25000
#define MAX_LST_LINE_LEN 256 #define MAX_LST_LINE_LEN 256