diff --git a/Makefile.am b/Makefile.am index 788f9ac..0554a4f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = CHANGES LICENSE README.rst win32 CMakeLists.txt cmake +EXTRA_DIST = CHANGES LICENSE README.rst CMakeLists.txt cmake SUBDIRS = doc src test # "make distcheck" builds the dvi target, so use it to check that the diff --git a/doc/gettingstarted.rst b/doc/gettingstarted.rst index 4e59e51..8abc5d5 100644 --- a/doc/gettingstarted.rst +++ b/doc/gettingstarted.rst @@ -154,6 +154,7 @@ in CMake_ is:: .. _CMake: http://www.cmake.org + Android ------- @@ -162,17 +163,6 @@ source root directory. The configuration header file is located in the ``android`` directory in the source distribution. -Windows -------- - -**This method is deprecated**. Using :ref:`CMake ` is now -preferred. - -Jansson can be built with Visual Studio 2010 (and probably newer -versions, too). The solution and project files are in the -``win32/vs2010/`` directory in the source distribution. - - Other Systems ------------- diff --git a/win32/jansson_config.h b/win32/jansson_config.h deleted file mode 100644 index 87f8d51..0000000 --- a/win32/jansson_config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2010-2014 Petri Lehtinen - * - * Jansson is free software; you can redistribute it and/or modify - * it under the terms of the MIT license. See LICENSE for details. - * - * - * This file specifies a part of the site-specific configuration for - * Jansson, namely those things that affect the public API in - * jansson.h. - * - * The configure script copies this file to jansson_config.h and - * replaces @var@ substitutions by values that fit your system. If you - * cannot run the configure script, you can do the value substitution - * by hand. - */ - -#ifndef JANSSON_CONFIG_H -#define JANSSON_CONFIG_H - -/* If your compiler supports the inline keyword in C, JSON_INLINE is - defined to `inline', otherwise empty. In C++, the inline is always - supported. */ -#ifdef __cplusplus -#define JSON_INLINE inline -#else -#define JSON_INLINE __inline -#endif - -/* If your compiler supports the `long long` type and the strtoll() - library function, JSON_INTEGER_IS_LONG_LONG is defined to 1, - otherwise to 0. */ -#define JSON_INTEGER_IS_LONG_LONG 1 - -/* If locale.h and localeconv() are available, define to 1, - otherwise to 0. */ -#define JSON_HAVE_LOCALECONV 1 - -#endif diff --git a/win32/vs2010/jansson.sln b/win32/vs2010/jansson.sln deleted file mode 100644 index 58f911b..0000000 --- a/win32/vs2010/jansson.sln +++ /dev/null @@ -1,20 +0,0 @@ - -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 deleted file mode 100644 index d5b2a87..0000000 --- a/win32/vs2010/jansson.vcxproj +++ /dev/null @@ -1,108 +0,0 @@ - - - - - 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 deleted file mode 100644 index f8eee30..0000000 --- a/win32/vs2010/jansson.vcxproj.filters +++ /dev/null @@ -1,69 +0,0 @@ - - - - - {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 deleted file mode 100644 index ace9a86..0000000 --- a/win32/vs2010/jansson.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file