From d8b49034c91be1fead43f7f9be4d8ce8d82cf271 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 22 Nov 2013 10:02:57 -0700 Subject: [PATCH] added jansson to the main project --- configure.ac | 3 + deps/jansson/src/dump.c | 2 +- deps/jansson/src/error.c | 2 +- deps/jansson/src/load.c | 4 +- deps/jansson/win32/vs2010/jansson.sln | 8 ++- deps/jansson/win32/vs2010/jansson.vcxproj | 77 ++++++++++++++++++++++- libobs/obs.c | 2 +- vs/2010/OBS.sln | 10 +++ 8 files changed, 100 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index a35566ab6..de9559872 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,9 @@ AC_TYPE_UINT64_T AC_TYPE_UINT8_T AC_CHECK_TYPES([ptrdiff_t]) +AC_CHECK_HEADER([jansson.h], , AC_MSG_ERROR([libjansson header not found])) +AC_CHECK_LIB([jansson], [json_load_file], , AC_MSG_ERROR([libjansson not found])) + # Checks for library functions. AC_FUNC_FSEEKO AC_FUNC_STRTOD diff --git a/deps/jansson/src/dump.c b/deps/jansson/src/dump.c index d347aae5f..26a1906e7 100644 --- a/deps/jansson/src/dump.c +++ b/deps/jansson/src/dump.c @@ -230,7 +230,7 @@ static int do_dump(const json_t *json, size_t flags, int depth, goto array_error; array->visited = 1; - n = json_array_size(json); + n = (int)json_array_size(json); if(dump("[", 1, data)) goto array_error; diff --git a/deps/jansson/src/error.c b/deps/jansson/src/error.c index a544a59fb..2ba8d82ce 100644 --- a/deps/jansson/src/error.c +++ b/deps/jansson/src/error.c @@ -56,7 +56,7 @@ void jsonp_error_vset(json_error_t *error, int line, int column, error->line = line; error->column = column; - error->position = position; + error->position = (int)position; vsnprintf(error->text, JSON_ERROR_TEXT_LENGTH, msg, ap); error->text[JSON_ERROR_TEXT_LENGTH - 1] = '\0'; diff --git a/deps/jansson/src/load.c b/deps/jansson/src/load.c index 2adaee80d..5d0d1efcd 100644 --- a/deps/jansson/src/load.c +++ b/deps/jansson/src/load.c @@ -171,7 +171,7 @@ static int stream_get(stream_t *stream, json_error_t *error) /* multi-byte UTF-8 sequence */ int i, count; - count = utf8_check_first(c); + count = (int)utf8_check_first(c); if(!count) goto out; @@ -900,7 +900,7 @@ static json_t *parse_json(lex_t *lex, size_t flags, json_error_t *error) if(error) { /* Save the position even though there was no error */ - error->position = lex->stream.position; + error->position = (int)lex->stream.position; } return result; diff --git a/deps/jansson/win32/vs2010/jansson.sln b/deps/jansson/win32/vs2010/jansson.sln index 58f911ba8..f5640eb7a 100644 --- a/deps/jansson/win32/vs2010/jansson.sln +++ b/deps/jansson/win32/vs2010/jansson.sln @@ -1,18 +1,24 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jansson", "jansson.vcxproj", "{76226D20-1972-4789-A595-EDACC7A76DC3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|Win32.ActiveCfg = Debug|Win32 {76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|Win32.Build.0 = Debug|Win32 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|x64.ActiveCfg = Debug|x64 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|x64.Build.0 = Debug|x64 {76226D20-1972-4789-A595-EDACC7A76DC3}.Release|Win32.ActiveCfg = Release|Win32 {76226D20-1972-4789-A595-EDACC7A76DC3}.Release|Win32.Build.0 = Release|Win32 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Release|x64.ActiveCfg = Release|x64 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/deps/jansson/win32/vs2010/jansson.vcxproj b/deps/jansson/win32/vs2010/jansson.vcxproj index d5b2a8796..a97aeaf03 100644 --- a/deps/jansson/win32/vs2010/jansson.vcxproj +++ b/deps/jansson/win32/vs2010/jansson.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -38,12 +46,23 @@ - DynamicLibrary + StaticLibrary + true + Unicode + + + StaticLibrary true Unicode - DynamicLibrary + StaticLibrary + false + true + Unicode + + + StaticLibrary false true Unicode @@ -54,20 +73,36 @@ + + + + + + true Output\$(Configuration)\ Build\$(Configuration)\ + + true + Output\$(Configuration)\ + Build\$(Configuration)\ + false Output\$(Configuration)\ Build\$(Configuration)\ + + false + Output\$(Configuration)\ + Build\$(Configuration)\ + NotUsing @@ -76,6 +111,23 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;JANSSON_DLL_EXPORTS;%(PreprocessorDefinitions) .. 4996 + MultiThreadedDebug + + + Windows + true + ../../src/jansson.def + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;JANSSON_DLL_EXPORTS;%(PreprocessorDefinitions) + .. + 4996 + MultiThreadedDebug Windows @@ -93,6 +145,27 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;JANSSON_DLL_EXPORTS;%(PreprocessorDefinitions) .. 4996 + MultiThreaded + + + Windows + true + true + true + ../../src/jansson.def + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;JANSSON_DLL_EXPORTS;%(PreprocessorDefinitions) + .. + 4996 + MultiThreaded Windows diff --git a/libobs/obs.c b/libobs/obs.c index 7037c1719..d111dcc17 100644 --- a/libobs/obs.c +++ b/libobs/obs.c @@ -202,7 +202,7 @@ static bool obs_init_data(void) static void obs_free_data(void) { struct obs_data *data = &obs->data; - size_t i; + uint32_t i; for (i = 0; i < MAX_CHANNELS; i++) obs_set_output_source(i, NULL); diff --git a/vs/2010/OBS.sln b/vs/2010/OBS.sln index 1e0dcabb0..840ff471f 100644 --- a/vs/2010/OBS.sln +++ b/vs/2010/OBS.sln @@ -33,6 +33,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew_static", "..\..\libobs EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OBS", "OBS\OBS.vcxproj", "{C6CD0240-5A92-43F6-B0EE-FF3ACE10742F}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jansson", "..\..\deps\jansson\win32\vs2010\jansson.vcxproj", "{76226D20-1972-4789-A595-EDACC7A76DC3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -105,6 +107,14 @@ Global {C6CD0240-5A92-43F6-B0EE-FF3ACE10742F}.Release|Win32.Build.0 = Release|Win32 {C6CD0240-5A92-43F6-B0EE-FF3ACE10742F}.Release|x64.ActiveCfg = Release|x64 {C6CD0240-5A92-43F6-B0EE-FF3ACE10742F}.Release|x64.Build.0 = Release|x64 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|Win32.ActiveCfg = Debug|Win32 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|Win32.Build.0 = Debug|Win32 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|x64.ActiveCfg = Debug|x64 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|x64.Build.0 = Debug|x64 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Release|Win32.ActiveCfg = Release|Win32 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Release|Win32.Build.0 = Release|Win32 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Release|x64.ActiveCfg = Release|x64 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE