[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1054] trunk/lvzip

[<lab...@us...>]

Revision: 1054
          http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1054&view=rev
Author:   labviewer
Date:     2010-07-01 02:54:21 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/lvzip/c_source/Makefile.x64
    trunk/lvzip/c_source/zlibvc.dsp
    trunk/lvzip/source/Win64/lvzlib.dll

Added Paths:
-----------
    trunk/lvzip/c_source/lvzlib.def

Modified: trunk/lvzip/c_source/Makefile.x64
===================================================================
--- trunk/lvzip/c_source/Makefile.x64	2010-06-16 23:33:16 UTC (rev 1053)
+++ trunk/lvzip/c_source/Makefile.x64	2010-07-01 02:54:21 UTC (rev 1054)
@@ -25,6 +25,7 @@
         iowin.c \
         iomem.c \
         lvutil.c \
+	    mztools.c \
         zip.c \
         unzip.c
 
@@ -43,21 +44,34 @@
 	 $(OUTDIR)\iowin.obj \
      $(OUTDIR)\iomem.obj \
      $(OUTDIR)\lvutil.obj \
+	 $(OUTDIR)\mztools.obj \
      $(OUTDIR)\zip.obj \
      $(OUTDIR)\unzip.obj
 
 ELIBS=user32.lib kernel32.lib labview.lib
 
 # Build rules for resource files
-    
+  
+# Update the resources
+  
 $(OUTDIR)\lvzlib.res: zlib.rc 
     $(rc) $(rcflags) $(rcvars) /fo $(OUTDIR)\lvzlib.res zlib.rc
 
+# Compile the sources
+
 .c{$(OUTDIR)}.obj:
     $(cc) $(cdebug) $(cflags) $(cvarsdll) /Fp"$(OUTDIR)\\" /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" $**
     
-$(OUTDIR)\lvzlib.dll: $(OBJS) $(OUTDIR)\lvzlib.res
-	$(link) $(ldebug) $(dlllflags) $(conlibsdll) /MACHINE:$(CPU) -out:$(OUTDIR)\lvzlib.dll $(OBJS) $(ELIBS) /PDB:$(OUTDIR)\$(PROJ).PDB $(OUTDIR)\lvzlib.res 
+# Update the import library
 
+$(OUTDIR)\lvzlib.exp: $(OBJS) lvzlib.def
+    $(implib) -machine:$(CPU) -def:lvzlib.def -out:$(OUTDIR)\lvzlib.lib $(OBJS)
+
+# Update the dynamic link library
+
+$(OUTDIR)\lvzlib.dll: $(OBJS) $(OUTDIR)\lvzlib.res $(OUTDIR)\lvzlib.exp lvzlib.def
+	$(link) $(ldebug) $(dlllflags) $(conlibsdll) /MACHINE:$(CPU) -out:$(OUTDIR)\lvzlib.dll  \
+	$(OBJS) $(ELIBS) $(OUTDIR)\lvzlib.exp $(OUTDIR)\lvzlib.res
+
 clean:
 	$(CLEANUP)
\ No newline at end of file

Added: trunk/lvzip/c_source/lvzlib.def
===================================================================
--- trunk/lvzip/c_source/lvzlib.def	                        (rev 0)
+++ trunk/lvzip/c_source/lvzlib.def	2010-07-01 02:54:21 UTC (rev 1054)
@@ -0,0 +1,64 @@
+LIBRARY		"lvzlib"
+
+DESCRIPTION	'"""LabVIEW zlib data compression library"""'
+
+
+VERSION		1.21
+
+
+HEAPSIZE	1048576,8192
+
+EXPORTS
+    DLLVersion
+    InitializeFileFuncs
+    LVPath_ToText
+    LVPath_UtilFileInfo
+    LVPath_OpenFile
+    LVPath_HasResourceFork
+    LVPath_EncodeMacbinary
+    LVPath_DecodeMacbinary
+
+    lvzip_adler32
+    lvzip_compress
+	lvzip_compress2
+    lvzip_crc32
+    lvzip_deflate
+    lvzip_inflate
+    lvzip_uncompress
+    lvzip_zlibVersion
+
+    lvzip_unzClose
+    lvzip_unzCloseCurrentFile
+    lvzip_unzGetCurrentFileInfo
+    lvzip_unzGetFilePos
+	lvzip_unzGetGlobalComment
+    lvzip_unzGetGlobalInfo
+    lvzip_unzGetLocalExtrafield
+    lvzip_unzGoToFilePos
+    lvzip_unzGoToFirstFile
+    lvzip_unzGoToNextFile
+    lvzip_unzLocateFile
+    lvzip_unzOpen
+    lvzip_unzOpen2
+    lvzip_unzOpen2_64
+	lvzip_unzOpenCurrentFile
+    lvzip_unzOpenCurrentFile2
+    lvzip_unzOpenCurrentFile3
+    lvzip_unzOpenCurrentFilePassword
+    lvzip_unzReadCurrentFile
+    lvzip_unzRepair
+    lvzip_unzStringFileNameCompare
+    lvzip_unztell
+    lvzip_unzeof
+    
+    lvzip_zipClose
+    lvzip_zipClose2
+    lvzip_zipCloseFileInZip
+    lvzip_zipCloseFileInZipRaw
+	lvzip_zipOpen
+    lvzip_zipOpen2
+	lvzip_zipOpen2_64
+    lvzip_zipOpenNewFileInZip
+    lvzip_zipOpenNewFileInZip2
+    lvzip_zipOpenNewFileInZip3
+    lvzip_zipWriteInFileInZip

Modified: trunk/lvzip/c_source/zlibvc.dsp
===================================================================
--- trunk/lvzip/c_source/zlibvc.dsp	2010-06-16 23:33:16 UTC (rev 1053)
+++ trunk/lvzip/c_source/zlibvc.dsp	2010-07-01 02:54:21 UTC (rev 1054)
@@ -312,23 +312,6 @@
 # Begin Source File
 
 SOURCE=.\ioapi.c
-
-!IF  "$(CFG)" == "zlibvc - Win32 DLL Release"
-
-!ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL Debug"
-
-!ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL ASM Release"
-
-!ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL ASM Debug"
-
-!ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL ASM Obj Release"
-
-!ELSEIF  "$(CFG)" == "zlibvc - Win32 static ASM Release"
-
-!ELSEIF  "$(CFG)" == "zlibvc - Win32 static Release"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
@@ -344,6 +327,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\lvzlib.def
+# End Source File
+# Begin Source File
+
 SOURCE=.\MacBinaryIII.c
 # PROP Exclude_From_Build 1
 # End Source File

Modified: trunk/lvzip/source/Win64/lvzlib.dll
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.