Permalink
Browse files

Auto stash before merge of "master" and "origin/master"

  • Loading branch information...
jackeri committed Nov 14, 2017
1 parent 5fcdf76 commit f89cefd8733cb78d2de90e277e7addac36c8247a
Showing with 6 additions and 15 deletions.
  1. +4 −0 cmake/ETLPlatform.cmake
  2. +0 −9 src/sdl/sdl_defs.h
  3. +1 −5 src/sys/sys_win32.c
  4. +1 −1 src/tools/shdr/shaders2h.cpp
View
@@ -105,6 +105,10 @@ elseif(WIN32)
endif(WIN64)
set(OS_LIBRARIES wsock32 ws2_32 psapi winmm)
if(BUNDLED_SDL)
# Libraries for Win32 native and MinGW required by static SDL2 build
list(APPEND OS_LIBRARIES user32 gdi32 winmm imm32 ole32 oleaut32 version uuid)
endif()
set(LIB_SUFFIX "_mp_")
if(MSVC)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHsc /O2")
View
@@ -35,20 +35,11 @@
#ifndef INCLUDE_SDLDEF_H
#define INCLUDE_SDLDEF_H
#if !defined(BUNDLED_SDL) && __APPLE__
#include "SDL.h"
#include "SDL_cpuinfo.h"
#include "SDL_syswm.h"
#include "SDL_video.h"
#include "SDL_loadso.h"
#include "SDL_cpuinfo.h"
#else
#include <SDL2/SDL.h>
#include <SDL2/SDL_cpuinfo.h>
#include <SDL2/SDL_syswm.h>
#include <SDL2/SDL_video.h>
#include <SDL2/SDL_loadso.h>
#include <SDL2/SDL_cpuinfo.h>
#endif
#endif // #ifndef INCLUDE_SDLDEF_H
View
@@ -34,11 +34,7 @@
*/
#ifndef DEDICATED
# ifdef BUNDLED_SDL
# include "SDL_video.h"
# else
# include <SDL2/SDL_video.h>
# endif
# include <SDL2/SDL_video.h>
#endif
#include "../qcommon/q_shared.h"
@@ -342,7 +342,7 @@ static void write_const_char(FILE *outputFile, const string& name, const string&
}
else
{
fprintf(outputFile, "const char %s[%i] =\n{\n", name.c_str(), text.size() + 1); // We need extra char for the ending 0x00
fprintf(outputFile, "const char %s[%i] =\n{\n", name.c_str(), int(text.size() + 1)); // We need extra char for the ending 0x00
for (size_t i = 0; i < text.size();)
{
size_t x = 0;

0 comments on commit f89cefd

Please sign in to comment.