Add glew

.gitignore

@@ -0,0 +1,3 @@
+Release
+Debug
+*.vcxproj.user

README.md

@@ -3,8 +3,23 @@ native
 
 This is my library of stuff that I use when writing C++ programs, mostly for Android. It has some basic OpenGL utility code, JSON read/write (two libraries that should be made more similar), 2D texture atlases and drawing code, ETC1 texture loading support, basic logging, etc. The associated tools to create ZIM texture files and atlases do not yet live here but I might move them here eventually.
 
+
+This project incorporates code from a variety of public domain or similarly-licensed code. This is the list:
+
+etcpack by Ericsson, in a cleaned up form. public domain?
+sha1, public domain implementation by Dominik Reichl
+json_writer by me (Henrik Rydgård)
+vjson in a heavily modified form, originally by ???  (TODO)
+libzip with attribution "Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner"
+stb_vorbis, public domain by Sean Barrett of RAD Tools
+
+If you're not okay with the licenses above, don't use this code.
+
 If you find this useful for your own projects, drop me a line at hrydgard@gmail.com . 
 
-I hereby release this code under the BSD license.
+I hereby release all code here not under the licenses above to the public domain.
 
 Henrik Rydgård
+
+
+

json/json_writer.h

@@ -2,8 +2,13 @@
 // apart from the string being built-up, which could easily be replaced
 // with a file stream (although I've chosen not to do that just yet).
 //
+// Writes nicely 2-spade indented output with correct comma-placement
+// in arrays and dictionaries.
+//
+// Does not deal with encodings in any way.
+//
 // Zero dependencies apart from stdlib.
-// Public domain.
+// Public domain by Henrik Rydgård.
 
 #include <string>
 #include <vector>
@@ -19,6 +24,7 @@ class JsonWriter {
   void end();
   void pushDict(const char *name);
   void pushArray(const char *name);
+	void pop();
   void writeBool(bool value);
   void writeBool(const char *name, bool value);
   void writeInt(int value);
@@ -27,7 +33,6 @@ class JsonWriter {
   void writeFloat(const char *name, double value);
   void writeString(const char *value);
   void writeString(const char *name, const char *value);
-  void pop();
 
   std::string str() const {
     return str_.str();

native.vcxproj

@@ -56,7 +56,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\libpng;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\zlib;..\native;..\RollerballGL;..\native\ext\glew;..\SDL\include;..\libpng;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -72,7 +72,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\libpng;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\zlib;..\native;..\RollerballGL;..\native\ext\glew;..\SDL\include;..\libpng;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -83,7 +83,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="file\CMakeLists.txt" />
-    <None Include="ReadMe.txt" />
+    <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="audio\mixer.h" />

native.vcxproj.filters

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <None Include="ReadMe.txt" />
     <None Include="file\CMakeLists.txt">
       <Filter>file</Filter>
     </None>
+    <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="base\logging.h" />