diff options
| author | Riza Sulistyo <riza@teluu.com> | 2013-03-05 08:21:02 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2013-03-05 08:21:02 +0000 |
| commit | 1005594e42bd94a5daa29d633f73f7e54bece5b9 (patch) | |
| tree | 5c996c8cc723bcec4744fa0e6079c74441672da3 | |
| parent | 04088ae49a729672ab63a6f616b00c34498c22b3 (diff) | |
Misc (re #1559): add macro PJMEDIA_SDL_LIB to manually specify SDL library name on MSVC
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4414 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/include/pjmedia-videodev/config.h | 11 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-videodev/sdl_dev.c | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pjmedia/include/pjmedia-videodev/config.h b/pjmedia/include/pjmedia-videodev/config.h index 5d261fb3..3159c95b 100644 --- a/pjmedia/include/pjmedia-videodev/config.h +++ b/pjmedia/include/pjmedia-videodev/config.h @@ -132,6 +132,17 @@ PJ_BEGIN_DECL # define PJMEDIA_VIDEO_DEV_HAS_AVI 1 #endif +/** + * Specify the SDL library name to be linked with Visual Studio project. + * By default, the name is autodetected based on SDL version ("sdl.lib" or + * "sdl2.lib"), but application may explicitly specify the library name if this + * autodetection fails. Common names are: "sdl2.lib" or "sdl.lib". + * + * Default: undeclared. + */ +#ifndef PJMEDIA_SDL_LIB +# undef PJMEDIA_SDL_LIB +#endif /** * @} diff --git a/pjmedia/src/pjmedia-videodev/sdl_dev.c b/pjmedia/src/pjmedia-videodev/sdl_dev.c index ec43a4c2..a3549522 100644 --- a/pjmedia/src/pjmedia-videodev/sdl_dev.c +++ b/pjmedia/src/pjmedia-videodev/sdl_dev.c @@ -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") |