diff options
author | Jason Parker <jparker@digium.com> | 2013-03-11 15:09:56 -0500 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:09:56 -0500 |
commit | 483805f79570115ab95c69698792d238c1719b1b (patch) | |
tree | 6b53ab2fd2b2478f864ccc8bd1b0bfaedc4d2050 /pjmedia/src/pjmedia-videodev/sdl_dev.c | |
parent | f3ab456a17af1c89a6e3be4d20c5944853df1cb0 (diff) |
Import pjproject-2.1
Diffstat (limited to 'pjmedia/src/pjmedia-videodev/sdl_dev.c')
-rw-r--r-- | pjmedia/src/pjmedia-videodev/sdl_dev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia-videodev/sdl_dev.c b/pjmedia/src/pjmedia-videodev/sdl_dev.c index 7e40da1..9c0944b 100644 --- a/pjmedia/src/pjmedia-videodev/sdl_dev.c +++ b/pjmedia/src/pjmedia-videodev/sdl_dev.c @@ -1,4 +1,4 @@ -/* $Id: sdl_dev.c 4157 2012-06-06 09:37:25Z nanang $ */ +/* $Id: sdl_dev.c 4414 2013-03-05 08:21:02Z riza $ */ /* * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com) * @@ -1418,7 +1418,9 @@ static pj_status_t job_queue_destroy(job_queue *jq) } #ifdef _MSC_VER -# if SDL_VERSION_ATLEAST(2,0,0) +# if defined(PJMEDIA_SDL_LIB) +# pragma comment( lib, PJMEDIA_SDL_LIB) +# elif SDL_VERSION_ATLEAST(2,0,0) # pragma comment( lib, "sdl2.lib") # elif SDL_VERSION_ATLEAST(1,3,0) # pragma comment( lib, "sdl.lib") |