fix file extensions, use TX_START / TX_END markers

Author: bagheadspidey

build/build.sh

@@ -11,6 +11,7 @@ cd ..
 rm filechars
 
 export BUILD_STATIC=1
+export BUILD_OBJECT=1
 
 cd src
   ../build/linux-build.sh
@@ -30,7 +31,7 @@ cp  magic/* $l/magic; cp  magic/* $w/magic
 cp *.txt $l; cp *.txt $w
 mv src/unwad.static $l/unwad
 mv src/unwad.exe $w; cp dll/*.dll $w
-mv src/unwad build
+mv src/unwad .
 
 cd ./release/l/
 rm ../linux/unwad.tar.gz

build/linux-build.sh

@@ -12,25 +12,33 @@ cd ../qmus2mid
   qmus2mid.cpp
 cd ../..
 
-export includes="-I../include/pngpp -I../include -I.."
 export mz_dir=../include/minizip
 export qm_dir=../include/qmus2mid
-export bs="g++ -Wall $includes unwad.cpp \
-$qm_dir/qmus2mid.o \
-$mz_dir/minizip.o $mz_dir/ioapi.o $mz_dir/zip.o $mz_dir/unzip.o"
+
+export includes="-I../include/pngpp -I../include -I.."
 export linked="-lmagic -lpng -lz"
 export static="/usr/lib/libmagic.a /usr/lib/libpng.a /usr/lib/libz.a"
+export stuff="$qm_dir/qmus2mid.o $mz_dir/minizip.o $mz_dir/ioapi.o $mz_dir/zip.o $mz_dir/unzip.o"
 
 cd src
+  #echo building unwad.o
+  #g++ -Wall $includes unwad.cpp -c
   echo building unwad
-  $bs $linked -o unwad
+  #g++ -Wall $includes unwad.cpp -c
+  g++ -Wall  unwad.cpp $includes $linked $stuff -o unwad
   strip unwad
   if echo "$BUILD_STATIC" | grep -q "1"; then
-      echo building unwad.static
-      $bs $static -o unwad.static
-      strip unwad.static
+    #g++ -Wall $includes unwad.cpp -c
+    g++ -Wall unwad.cpp $includes $static $stuff -o unwad.static
+    strip unwad.static
+  fi
+  if echo "$BUILD_OBJECT" | grep -q "1"; then
+    g++ -Wall -DUNWAD_OBJECT=1 $includes unwad.cpp -c
+    #g++ -Wall unwad.cpp $includes $static $stuff -o unwad.static
+    strip unwad.static
   fi
 cd ..
 
-rm include/minizip/*.o
-rm include/qmus2mid/*.o
+mv include/minizip/*.o ../obj
+mv include/qmus2mid/*.o ../obj
+mv src/*.o ../obj

include/minizip/miniunz.c

@@ -461,7 +461,7 @@ int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,passwo
 }
 
 
-int main(argc,argv)
+int muz_main(argc,argv)
     int argc;
     char *argv[];
 {

magic/magic

@@ -8614,7 +8614,7 @@
 # URL:	http://www.mathsoft.com/
 # From:	Josh Triplett <[email protected]>
 
-0	string	.MCAD\		Mathcad document
+#0	string	.MCAD\		Mathcad document
 
 #------------------------------------------------------------------------------
 # mathematica:  file(1) magic for mathematica files