From 7ca783c3bc24cb7820b8afeab6a21b9680c8caf5 Mon Sep 17 00:00:00 2001 From: Rogerz Zhang Date: Mon, 30 Apr 2012 19:39:45 +0800 Subject: [PATCH 1/2] Add vs2010 solution and project --- src/hashtable.c | 2 +- src/jansson.h | 2 +- .../jansson_config.h | 0 win32/vs2010/jansson.sln | 20 ++++ win32/vs2010/jansson.vcxproj | 108 ++++++++++++++++++ win32/vs2010/jansson.vcxproj.filters | 69 +++++++++++ win32/vs2010/jansson.vcxproj.user | 3 + 7 files changed, 202 insertions(+), 2 deletions(-) rename src/jansson_config.h.win32 => win32/jansson_config.h (100%) create mode 100644 win32/vs2010/jansson.sln create mode 100644 win32/vs2010/jansson.vcxproj create mode 100644 win32/vs2010/jansson.vcxproj.filters create mode 100644 win32/vs2010/jansson.vcxproj.user diff --git a/src/hashtable.c b/src/hashtable.c index fce7550..76cf69b 100644 --- a/src/hashtable.c +++ b/src/hashtable.c @@ -7,7 +7,7 @@ #include #include -#include "jansson_config.h" /* for JSON_INLINE */ +#include /* for JSON_INLINE */ #include "jansson_private.h" /* for container_of() */ #include "hashtable.h" diff --git a/src/jansson.h b/src/jansson.h index 25f8746..e22b68f 100644 --- a/src/jansson.h +++ b/src/jansson.h @@ -12,7 +12,7 @@ #include /* for size_t */ #include -#include "jansson_config.h" +#include #ifdef __cplusplus extern "C" { diff --git a/src/jansson_config.h.win32 b/win32/jansson_config.h similarity index 100% rename from src/jansson_config.h.win32 rename to win32/jansson_config.h diff --git a/win32/vs2010/jansson.sln b/win32/vs2010/jansson.sln new file mode 100644 index 0000000..58f911b --- /dev/null +++ b/win32/vs2010/jansson.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jansson", "jansson.vcxproj", "{76226D20-1972-4789-A595-EDACC7A76DC3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + 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}.Release|Win32.ActiveCfg = Release|Win32 + {76226D20-1972-4789-A595-EDACC7A76DC3}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/win32/vs2010/jansson.vcxproj b/win32/vs2010/jansson.vcxproj new file mode 100644 index 0000000..d5b2a87 --- /dev/null +++ b/win32/vs2010/jansson.vcxproj @@ -0,0 +1,108 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + + + {76226D20-1972-4789-A595-EDACC7A76DC3} + Win32Proj + jansson_dll + jansson + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + true + Output\$(Configuration)\ + Build\$(Configuration)\ + + + false + Output\$(Configuration)\ + Build\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;JANSSON_DLL_EXPORTS;%(PreprocessorDefinitions) + .. + 4996 + + + Windows + true + ../../src/jansson.def + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;JANSSON_DLL_EXPORTS;%(PreprocessorDefinitions) + .. + 4996 + + + Windows + true + true + true + ../../src/jansson.def + + + + + + \ No newline at end of file diff --git a/win32/vs2010/jansson.vcxproj.filters b/win32/vs2010/jansson.vcxproj.filters new file mode 100644 index 0000000..f8eee30 --- /dev/null +++ b/win32/vs2010/jansson.vcxproj.filters @@ -0,0 +1,69 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/win32/vs2010/jansson.vcxproj.user b/win32/vs2010/jansson.vcxproj.user new file mode 100644 index 0000000..ace9a86 --- /dev/null +++ b/win32/vs2010/jansson.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file From a79f64e1551ca619594e2ae4dc10c84773cda884 Mon Sep 17 00:00:00 2001 From: Rogerz Zhang Date: Mon, 30 Apr 2012 22:32:25 +0800 Subject: [PATCH 2/2] Fix build warnings under MinGW --- src/load.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/load.c b/src/load.c index 7acd3e7..d88a704 100644 --- a/src/load.c +++ b/src/load.c @@ -447,7 +447,7 @@ out: } #if JSON_INTEGER_IS_LONG_LONG -#ifdef _WIN32 +#ifdef _MSC_VER // Microsoft Visual Studio #define json_strtoint _strtoi64 #else #define json_strtoint strtoll