fix gitignore

B3n30 · Jun 5, 2014 · 3616973 · 3616973
1 parent 7fe6cdd
commit 3616973
Show file tree

Hide file tree

Showing 130 changed files with 10,354 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 # Visual Studio
-[Bb]in/
 [Dd]ebug/
 [Rr]elease/
 x64/
@@ -28,6 +27,5 @@ DerivedData
 contents.xcworkspacedata
 Debug/
 Release/
-Lib/
 .DS_Store
 .Trashes
diff --git a/DependentExtensions/DXTCompressor/External/lib/cg.lib b/DependentExtensions/DXTCompressor/External/lib/cg.lib
diff --git a/DependentExtensions/DXTCompressor/External/lib/cgD3D10.lib b/DependentExtensions/DXTCompressor/External/lib/cgD3D10.lib
diff --git a/DependentExtensions/DXTCompressor/External/lib/cgD3D8.lib b/DependentExtensions/DXTCompressor/External/lib/cgD3D8.lib
diff --git a/DependentExtensions/DXTCompressor/External/lib/cgD3D9.lib b/DependentExtensions/DXTCompressor/External/lib/cgD3D9.lib
diff --git a/DependentExtensions/DXTCompressor/External/lib/cgGL.lib b/DependentExtensions/DXTCompressor/External/lib/cgGL.lib
diff --git a/DependentExtensions/DXTCompressor/External/lib/glew32.lib b/DependentExtensions/DXTCompressor/External/lib/glew32.lib
diff --git a/DependentExtensions/DXTCompressor/External/lib/glut32.lib b/DependentExtensions/DXTCompressor/External/lib/glut32.lib
diff --git a/DependentExtensions/DXTCompressor/External/lib/glutstatic.lib b/DependentExtensions/DXTCompressor/External/lib/glutstatic.lib
diff --git a/DependentExtensions/cat/lib/cat/big_x64.lib b/DependentExtensions/cat/lib/cat/big_x64.lib
diff --git a/DependentExtensions/cat/lib/cat/big_x64.o b/DependentExtensions/cat/lib/cat/big_x64.o
diff --git a/DependentExtensions/cat/lib/cat/big_x64.obj b/DependentExtensions/cat/lib/cat/big_x64.obj
diff --git a/DependentExtensions/jansson-2.4/test/bin/Makefile.am b/DependentExtensions/jansson-2.4/test/bin/Makefile.am
@@ -0,0 +1,6 @@
+check_PROGRAMS = json_process
+
+AM_CPPFLAGS = -I$(top_srcdir)/src
+AM_CFLAGS = -Wall -Werror
+LDFLAGS = -static  # for speed and Valgrind
+LDADD = $(top_builddir)/src/libjansson.la