mac support

DoubleSpout · Jun 20, 2013 · d31561b · d31561b
1 parent 94d1d28
commit d31561b
Show file tree

Hide file tree

Showing 39 changed files with 45 additions and 20 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -4,9 +4,33 @@
       "target_name": "ifile",
       "conditions": [
             ["OS==\"mac\"", {  
-                              "sources": [ "src/threads_a_gogo.cpp","src/queues_a_gogo.cpp"],
+                              "sources": ["src/ifile.cpp","src/ifile_class.cpp","src/gzip.cpp",
+            'src/zlib/adler32.c',
+            'src/zlib/compress.c',
+            'src/zlib/crc32.c',
+            'src/zlib/crc32.h',
+            'src/zlib/deflate.c',
+            'src/zlib/deflate.h',
+            'src/zlib/gzio.c',
+            'src/zlib/infback.c',
+            'src/zlib/inffast.c',
+            'src/zlib/inffast.h',
+            'src/zlib/inffixed.h',
+            'src/zlib/inflate.c',
+            'src/zlib/inflate.h',
+            'src/zlib/inftrees.c',
+            'src/zlib/inftrees.h',
+            'src/zlib/mozzconf.h',
+            'src/zlib/trees.c',
+            'src/zlib/trees.h',
+            'src/zlib/uncompr.c',
+            'src/zlib/zconf.h',
+            'src/zlib/zlib.h',
+            'src/zlib/zutil.c',
+            'src/zlib/zutil.h'
+       ],
                                "libraries": [],
-                               "cflags": ["-g", "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE_SOURCE", "-Wall", "-O0", "-Wunused-macros"],
+                               "cflags": [],
             }],
             ["OS==\"linux\"", {
 	    "sources": ["src/ifile.cpp","src/ifile_class.cpp","src/gzip.cpp",

diff --git a/build/Release/ifile.exp b/build/Release/ifile.exp
diff --git a/build/Release/ifile.lib b/build/Release/ifile.lib
diff --git a/build/Release/ifile.node b/build/Release/ifile.node
diff --git a/build/Release/ifile.pdb b/build/Release/ifile.pdb
diff --git a/build/Release/obj/ifile/CL.read.1.tlog b/build/Release/obj/ifile/CL.read.1.tlog
diff --git a/build/Release/obj/ifile/adler32.obj b/build/Release/obj/ifile/adler32.obj
diff --git a/build/Release/obj/ifile/cl.command.1.tlog b/build/Release/obj/ifile/cl.command.1.tlog
diff --git a/build/Release/obj/ifile/cl.write.1.tlog b/build/Release/obj/ifile/cl.write.1.tlog
diff --git a/build/Release/obj/ifile/compress.obj b/build/Release/obj/ifile/compress.obj
diff --git a/build/Release/obj/ifile/crc32.obj b/build/Release/obj/ifile/crc32.obj
diff --git a/build/Release/obj/ifile/deflate.obj b/build/Release/obj/ifile/deflate.obj
diff --git a/build/Release/obj/ifile/gzio.obj b/build/Release/obj/ifile/gzio.obj
diff --git a/build/Release/obj/ifile/gzip.obj b/build/Release/obj/ifile/gzip.obj
diff --git a/build/Release/obj/ifile/ifile.lastbuildstate b/build/Release/obj/ifile/ifile.lastbuildstate
@@ -1,2 +1,2 @@
 #v4.0:v100:false
-Release|x64|D:\github\ifile\build\|
+Release|x64|F:\github\ifile\build\|
diff --git a/build/Release/obj/ifile/ifile.obj b/build/Release/obj/ifile/ifile.obj
diff --git a/build/Release/obj/ifile/ifile.write.1.tlog b/build/Release/obj/ifile/ifile.write.1.tlog
@@ -1,3 +1,3 @@
-^D:\github\ifile\build\ifile.vcxproj
-D:\github\ifile\build\Release\ifile.lib
-D:\github\ifile\build\Release\ifile.exp
+^F:\github\ifile\build\ifile.vcxproj
+F:\github\ifile\build\Release\ifile.lib
+F:\github\ifile\build\Release\ifile.exp
diff --git a/build/Release/obj/ifile/ifile_class.obj b/build/Release/obj/ifile/ifile_class.obj
diff --git a/build/Release/obj/ifile/infback.obj b/build/Release/obj/ifile/infback.obj
diff --git a/build/Release/obj/ifile/inffast.obj b/build/Release/obj/ifile/inffast.obj
diff --git a/build/Release/obj/ifile/inflate.obj b/build/Release/obj/ifile/inflate.obj
diff --git a/build/Release/obj/ifile/inftrees.obj b/build/Release/obj/ifile/inftrees.obj
diff --git a/build/Release/obj/ifile/ioapi.obj b/build/Release/obj/ifile/ioapi.obj
diff --git a/build/Release/obj/ifile/iowin32.obj b/build/Release/obj/ifile/iowin32.obj
diff --git a/build/Release/obj/ifile/link.command.1.tlog b/build/Release/obj/ifile/link.command.1.tlog
diff --git a/build/Release/obj/ifile/link.read.1.tlog b/build/Release/obj/ifile/link.read.1.tlog
diff --git a/build/Release/obj/ifile/link.write.1.tlog b/build/Release/obj/ifile/link.write.1.tlog
diff --git a/build/Release/obj/ifile/mt.command.1.tlog b/build/Release/obj/ifile/mt.command.1.tlog
diff --git a/build/Release/obj/ifile/mt.read.1.tlog b/build/Release/obj/ifile/mt.read.1.tlog
diff --git a/build/Release/obj/ifile/mt.write.1.tlog b/build/Release/obj/ifile/mt.write.1.tlog
diff --git a/build/Release/obj/ifile/trees.obj b/build/Release/obj/ifile/trees.obj
diff --git a/build/Release/obj/ifile/uncompr.obj b/build/Release/obj/ifile/uncompr.obj
diff --git a/build/Release/obj/ifile/unzip.obj b/build/Release/obj/ifile/unzip.obj
diff --git a/build/Release/obj/ifile/vc100.pdb b/build/Release/obj/ifile/vc100.pdb
diff --git a/build/Release/obj/ifile/zip.obj b/build/Release/obj/ifile/zip.obj
diff --git a/build/Release/obj/ifile/zutil.obj b/build/Release/obj/ifile/zutil.obj
diff --git a/build/binding.sln b/build/binding.sln
@@ -1,17 +1,17 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifile", "ifile.vcxproj", "{576B85F3-1672-2ECD-0373-4C212CD9525B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifile", "ifile.vcxproj", "{252626AE-05B7-4F44-259B-721FD7BEC25F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{576B85F3-1672-2ECD-0373-4C212CD9525B}.Debug|x64.ActiveCfg = Debug|x64
-		{576B85F3-1672-2ECD-0373-4C212CD9525B}.Debug|x64.Build.0 = Debug|x64
-		{576B85F3-1672-2ECD-0373-4C212CD9525B}.Release|x64.ActiveCfg = Release|x64
-		{576B85F3-1672-2ECD-0373-4C212CD9525B}.Release|x64.Build.0 = Release|x64
+		{252626AE-05B7-4F44-259B-721FD7BEC25F}.Debug|x64.ActiveCfg = Debug|x64
+		{252626AE-05B7-4F44-259B-721FD7BEC25F}.Debug|x64.Build.0 = Debug|x64
+		{252626AE-05B7-4F44-259B-721FD7BEC25F}.Release|x64.ActiveCfg = Release|x64
+		{252626AE-05B7-4F44-259B-721FD7BEC25F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/build/config.gypi b/build/config.gypi
@@ -31,7 +31,8 @@
     "v8_no_strict_aliasing": 1,
     "v8_use_snapshot": "false",
     "visibility": "",
-    "nodedir": "C:\\Users\\wuzh.UC888\\.node-gyp\\0.10.9",
-    "copy_dev_lib": "true"
+    "nodedir": "C:\\Users\\snoopyxdy\\.node-gyp\\0.10.10",
+    "copy_dev_lib": "true",
+    "standalone_static_library": 1
   }
 }
diff --git a/build/ifile.vcxproj b/build/ifile.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{576B85F3-1672-2ECD-0373-4C212CD9525B}</ProjectGuid>
+    <ProjectGuid>{252626AE-05B7-4F44-259B-721FD7BEC25F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>ifile</RootNamespace>
   </PropertyGroup>
@@ -38,7 +38,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\Users\wuzh.UC888\.node-gyp\0.10.9\src;C:\Users\wuzh.UC888\.node-gyp\0.10.9\deps\uv\include;C:\Users\wuzh.UC888\.node-gyp\0.10.9\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Users\snoopyxdy\.node-gyp\0.10.10\src;C:\Users\snoopyxdy\.node-gyp\0.10.10\deps\uv\include;C:\Users\snoopyxdy\.node-gyp\0.10.10\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -55,7 +55,7 @@
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>C:\Users\wuzh.UC888\.node-gyp\0.10.9\$(Configuration)\node.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\Users\snoopyxdy\.node-gyp\0.10.10\$(Configuration)\node.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AllowIsolation>true</AllowIsolation>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -65,13 +65,13 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>C:\Users\wuzh.UC888\.node-gyp\0.10.9\src;C:\Users\wuzh.UC888\.node-gyp\0.10.9\deps\uv\include;C:\Users\wuzh.UC888\.node-gyp\0.10.9\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Users\snoopyxdy\.node-gyp\0.10.10\src;C:\Users\snoopyxdy\.node-gyp\0.10.10\deps\uv\include;C:\Users\snoopyxdy\.node-gyp\0.10.10\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;BUILDING_V8_SHARED=1;BUILDING_UV_SHARED=1;BUILDING_NODE_EXTENSION;DEBUG;_DEBUG;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\Users\wuzh.UC888\.node-gyp\0.10.9\src;C:\Users\wuzh.UC888\.node-gyp\0.10.9\deps\uv\include;C:\Users\wuzh.UC888\.node-gyp\0.10.9\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Users\snoopyxdy\.node-gyp\0.10.10\src;C:\Users\snoopyxdy\.node-gyp\0.10.10\deps\uv\include;C:\Users\snoopyxdy\.node-gyp\0.10.10\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -96,7 +96,7 @@
       <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
     </Lib>
     <Link>
-      <AdditionalDependencies>C:\Users\wuzh.UC888\.node-gyp\0.10.9\$(Configuration)\node.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\Users\snoopyxdy\.node-gyp\0.10.10\$(Configuration)\node.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AllowIsolation>true</AllowIsolation>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -109,7 +109,7 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>C:\Users\wuzh.UC888\.node-gyp\0.10.9\src;C:\Users\wuzh.UC888\.node-gyp\0.10.9\deps\uv\include;C:\Users\wuzh.UC888\.node-gyp\0.10.9\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Users\snoopyxdy\.node-gyp\0.10.10\src;C:\Users\snoopyxdy\.node-gyp\0.10.10\deps\uv\include;C:\Users\snoopyxdy\.node-gyp\0.10.10\deps\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;BUILDING_V8_SHARED=1;BUILDING_UV_SHARED=1;BUILDING_NODE_EXTENSION;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>