Upgraded all builds to latest versions

internalG · Jan 10, 2013 · c3aa96e · c3aa96e
1 parent 4e6a8e0
commit c3aa96e
Show file tree

Hide file tree

Showing 34 changed files with 594 additions and 763 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,12 @@
 
 .gitignore.*
 .DS_Store
+*.bak
+*.old
 
 bin/
 tmp/
+tmp.*/
 log/
 
 droid-testapp/bin

diff --git a/build-droid/Makefile.minizip b/build-droid/Makefile.minizip
@@ -28,4 +28,4 @@ install : libminizip.a libminizip.so
 
 clean :
 	rm *.o
-	rm -f libminizip.so
+	rm -f libminizip.*
diff --git a/build-droid/Makefile.tinyxml b/build-droid/Makefile.tinyxml
@@ -7,45 +7,6 @@
 # This is a GNU make (gmake) makefile
 #****************************************************************************
 
-# DEBUG can be set to YES to include debugging info, or NO otherwise
-DEBUG          := NO
-
-# PROFILE can be set to YES to include profiling info, or NO otherwise
-PROFILE        := NO
-
-# TINYXML_USE_STL can be used to turn on STL support. NO, then STL
-# will not be used. YES will include the STL files.
-TINYXML_USE_STL := YES
-
-#****************************************************************************
-
-DEBUG_CFLAGS     := -Wall -Wno-format -g -DDEBUG
-RELEASE_CFLAGS   := -Wall -Wno-unknown-pragmas -Wno-format -O3
-
-LIBS		 :=
-
-DEBUG_CXXFLAGS   := ${DEBUG_CFLAGS} 
-RELEASE_CXXFLAGS := ${RELEASE_CFLAGS}
-
-DEBUG_LDFLAGS    := -g
-RELEASE_LDFLAGS  :=
-
-ifeq (YES, ${DEBUG})
-   CFLAGS       := ${DEBUG_CFLAGS}
-   CXXFLAGS     := ${DEBUG_CXXFLAGS}
-   LDFLAGS      := ${DEBUG_LDFLAGS}
-else
-   CFLAGS       := ${RELEASE_CFLAGS}
-   CXXFLAGS     := ${RELEASE_CXXFLAGS}
-   LDFLAGS      := ${RELEASE_LDFLAGS}
-endif
-
-ifeq (YES, ${PROFILE})
-   CFLAGS   := ${CFLAGS} -pg -O3
-   CXXFLAGS := ${CXXFLAGS} -pg -O3
-   LDFLAGS  := ${LDFLAGS} -pg
-endif
-
 #****************************************************************************
 # Preprocessor directives
 #****************************************************************************

diff --git a/build-droid/Makefile.zlib b/build-droid/Makefile.zlib
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,4 +28,4 @@ install : libminizip.a libminizip.so @@
     clean :
     	rm *.o
-    	rm -f libminizip.so
+    	rm -f libminizip.*