converted project to vs2013, removed 2010 support (ugh)

This commit is contained in:
jp9000
2013-12-14 16:01:30 -07:00
parent a526afd047
commit aead95f5e3
23 changed files with 71 additions and 48 deletions

View File

@@ -95,21 +95,6 @@ static bool scene_enum_children(void *data, size_t idx, obs_source_t *child)
return true;
}
/* thanks for being completely worthless, microsoft. */
#if 1
static const struct source_info scene_info =
{
"scene",
scene_getname,
scene_create,
scene_destroy,
scene_get_output_flags, NULL, NULL, NULL, NULL,
scene_video_render,
scene_getsize,
scene_getsize, NULL, NULL,
NULL, NULL
};
#else
static const struct source_info scene_info =
{
.name = "scene",
@@ -121,7 +106,6 @@ static const struct source_info scene_info =
.getwidth = scene_getsize,
.getheight = scene_getsize,
};
#endif
obs_scene_t obs_scene_create(void)
{

View File

@@ -26,26 +26,32 @@
/*
* Contains hacks for getting some C99 stuff working in VC, things like
* bool, inline, stdint
*
* TODO: Check for VC2013, because it actually supports this C99 stuff.
*/
#ifdef _MSC_VER
#define EXPORT extern __declspec(dllexport)
#else
#define EXPORT extern
#endif
#ifdef _MSC_VER
#pragma warning (disable : 4996)
/* Microsoft is one of the most inept companies on the face of the planet.
* The fact that even visual studio 2013 doesn't support the standard 'inline'
* keyword is so incredibly stupid that I just can't imagine what sort of
* incredibly inept moron could possibly be managing the visual C compiler
* project. They should be fired, and legally forbidden to have a job in
* ANYTHING even REMOTELY related to programming. FOREVER. This should also
* apply to the next 10 generations all of their descendents. */
#ifndef __cplusplus
#define inline __inline
#endif
#include "vc/stdint.h"
#include "vc/stdbool.h"
#define EXPORT extern __declspec(dllexport)
#else
#define EXPORT extern
#endif
#if _MSC_VER && _MSC_VER < 0x0708
#include "vc/vc_stdint.h"
#include "vc/vc_stdbool.h"
#ifndef __off_t_defined
#define __off_t_defined