0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #455 from Wedge009/Windows_updates

Browse source 
Minor Windows Updates
This commit is contained in:
Ignacio R. Morelle 2015-08-22 19:09:33 -03:00
commit 0d94262d9e
5 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -33,6 +33,8 @@ uninstall.vcproj
*.vcproj.*.user
projectfiles/VC[12]*
src/**/*.vcproj
/WindowsTimeout.ilk
/WindowsTimeout.pdb
# XCode
projectfiles/Xcode/**/build
@ -85,7 +87,7 @@ ReleaseDEBUG
Debug (fast)
tags
# build results ect.
# build results etc.
wesnoth_zip
wesnoth.exp
wesnoth.ilk

8
src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_common.inl
View file

@ -2,10 +2,14 @@
See a particular renderer's *.c file for specifics. */
// Visual C does not support static inline
// static inline only supported in Visual C++ from version 2015 but can use static __inline instead for older versions
#ifndef static_inline
#ifdef _MSC_VER
#define static_inline static
#if _MSC_VER < 1900
#define static_inline static __inline
#else
#define static_inline static inline
#endif
#else
#define static_inline static inline
#endif

8
src/SDL_gpu/SDL_gpu/GL_common/SDL_gpu_GL_matrix.c
View file

@ -12,10 +12,14 @@
#endif
// Visual C does not support static inline
// static inline only supported in Visual C++ from version 2015 but can use static __inline instead for older versions
#ifndef static_inline
#ifdef _MSC_VER
#define static_inline static
#if _MSC_VER < 1900
#define static_inline static __inline
#else
#define static_inline static inline
#endif
#else
#define static_inline static inline
#endif

10
src/SDL_gpu/SDL_gpu/SDL_gpu.h
View file

@ -244,7 +244,7 @@ typedef struct GPU_MatrixStack
typedef struct GPU_Context
{
/*! SDL_GLContext */
void* context;
void* context;
Uint8 failed;
/*! SDL window ID */
@ -800,9 +800,13 @@ struct GPU_Renderer
// Setup calls
// Visual C does not support static inline
// static inline only supported in Visual C++ from version 2015 but can use static __inline instead for older versions
#ifdef _MSC_VER
static SDL_version GPU_GetCompiledVersion(void)
#if _MSC_VER < 1900
static __inline SDL_version GPU_GetCompiledVersion(void)
#else
static inline SDL_version GPU_GetCompiledVersion(void)
#endif
#else
static inline SDL_version GPU_GetCompiledVersion(void)
#endif

2
src/gui/dialogs/label_settings.cpp
View file

@ -98,6 +98,6 @@ bool tlabel_settings::execute(display_context& dc, CVideo& video) {
}
void tlabel_settings::toggle_category(twidget& box, std::string category) {
all_labels[category] = static_cast<ttoggle_button&>(box).get_value();
all_labels[category] = (static_cast<ttoggle_button&>(box).get_value() != 0);
}
}