summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Haszlakiewicz <erh+git@nimenees.com>2017-10-22 22:46:05 -0400
committerEric Haszlakiewicz <erh+git@nimenees.com>2017-10-22 22:46:05 -0400
commitfabb84a7852b1c4d5ec4e4942fb682ed3c0640d1 (patch)
treec59e2f549990cddabda8c6eee1dafc002926bb06
parente424af32b7ccb6f3711c0c116754069b90707910 (diff)
downloadjson-c-fabb84a7852b1c4d5ec4e4942fb682ed3c0640d1.tar.gz
Remove out of date win32 build information, and mention the need to use cmake there.
-rw-r--r--README-WIN32.html27
-rw-r--r--README.html10
2 files changed, 8 insertions, 29 deletions
diff --git a/README-WIN32.html b/README-WIN32.html
deleted file mode 100644
index 15737c4..0000000
--- a/README-WIN32.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>JSON-C - A JSON implementation in C - Win32 specific notes</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- </head>
- <body>
- <h2>Windows specific notes for JSON-C</h2>
- <p><b>Win32 Specific Changes:</b></p>
- <ul>
- <li>
- Use <tt>json_config.h.win32</tt> to define Windows specific differences.</li>
- <li>
- Various functions have been redefined to their Win32 version (i.e. <tt>open</tt>
- on win32 is <tt>_open</tt>)</li>
- <li>
- Implemented missing functions from MS's libc (i.e. <tt>vasprintf</tt>)</li>
- <li>
- Added code to allow Win64 support without integer resizing issues, this
- probably makes it much nicer on 64bit machines everywhere (i.e. using <tt>ptrdiff_t</tt>
- for pointer math)</li>
- </ul>
- <p>This program is free software; you can redistribute it and/or modify it under
- the terms of the MIT License. See COPYING for details.</p>
- <hr />
- </body>
-</html>
diff --git a/README.html b/README.html
index 0b951fd..d361569 100644
--- a/README.html
+++ b/README.html
@@ -16,8 +16,14 @@
<h3>Building</h3>
<p>To setup JSON-C to build on your system please run <tt>configure</tt> and <tt>make</tt>.</p>
- <p>If you are on Win32 and are not using the VS project file, be sure
- to rename <tt>config.h.win32</tt> to <tt>config.h</tt> before building.</p>
+ <p>If you are on Win32 cmake is required, generally:</p>
+ <ul>
+ <li>mkdir build</li>
+ <li>cd build</li>
+ <li>cmake ..</li>
+ <li>msbuild "json-c.vcxproj" /m /verbosity:normal /p:OutDir=lib\</li>
+ <li>Or, open the project in Visual Studio</li>
+ </ul>
<h3>Documentation</h3>
<P>Doxygen generated documentation exists <a href="doc/html/json__object_8h.html">here</a>