visual studio project file updated

fangq · Jun 29, 2020 · cd4acb8 · cd4acb8
1 parent 3146e91
commit cd4acb8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/src/ubj/ubjrw.c b/src/ubj/ubjrw.c
@@ -27,7 +27,7 @@ static UBJ_TYPE compute_best_integer_type(ubjr_dynamic_t* vals, size_t sz)
 	size_t i;
 	for (i = 0; i < sz; i++)
 	{
-		typemask |= 1UL << ubjw_min_integer_type(vals[i].integer);
+		typemask |= 1UL << ubjw_min_integer_type(vals[i].data.integer);
 	}
 	return typemask2type(typemask);
 }
@@ -36,7 +36,7 @@ static uint32_t compute_best_string_type(ubjr_dynamic_t* vals, size_t sz)
 	size_t i;
 	for (i = 0; i < sz; i++)
 	{
-		if (strlen(vals[i].string) > 1)
+		if (strlen(vals[i].data.string) > 1)
 		{
 			return UBJ_STRING;
 		}
@@ -47,10 +47,11 @@ static UBJ_TYPE optimize_type(UBJ_TYPE typein,ubjr_dynamic_t* vals, size_t sz)
 {
 	static const uint32_t intmask = (1 << UBJ_INT8) | (1 << UBJ_UINT8) | (1 << UBJ_INT16) | (1 << UBJ_INT32) | (1 << UBJ_INT64);
 	static const uint32_t stringmask = (1 << UBJ_STRING) | (1 << UBJ_CHAR);
+        uint32_t tm;
 	if (typein != UBJ_MIXED)
 		return typein;
 	//integer optimization can be done here...
-	uint32_t tm = compute_typemask(vals, sz);
+	tm = compute_typemask(vals, sz);
 	if ((tm & intmask) == tm) //if all values are integers
 	{
 		return compute_best_integer_type(vals,sz);	//calculate the optimum type given the data

diff --git a/vsproj/mcx/mcx/mcx.vcxproj b/vsproj/mcx/mcx/mcx.vcxproj
@@ -82,7 +82,8 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>zlib.lib;cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>zlibstat.lib;cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
     </Link>
     <PostBuildEvent>
       <Command>echo copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
@@ -231,8 +232,6 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
     <ClCompile Include="..\..\..\src\mcx_shapes.c" />
     <ClCompile Include="..\..\..\src\mcx_utils.c" />
     <ClCompile Include="..\..\..\src\tictoc.c" />
-    <ClCompile Include="..\..\..\src\ubj\ubjr.c" />
-    <ClCompile Include="..\..\..\src\ubj\ubjrw.c" />
     <ClCompile Include="..\..\..\src\ubj\ubjw.c" />
     <ClCompile Include="..\..\..\src\zmat\easylzma\common_internal.c" />
     <ClCompile Include="..\..\..\src\zmat\easylzma\compress.c" />
@@ -257,12 +256,6 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
     <ClCompile Include="..\..\..\src\zmat\lz4\lz4hc.c" />
     <ClCompile Include="..\..\..\src\zmat\zmatlib.c" />
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\zlibstatic.lib" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\zlib.dll" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 8.0.targets" />

diff --git a/vsproj/mcx/mcx/mcx.vcxproj.filters b/vsproj/mcx/mcx/mcx.vcxproj.filters
@@ -91,12 +91,6 @@
     <ClCompile Include="..\..\..\src\zmat\easylzma\lzma_header.c">
       <Filter>zmat\easylzma</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ubj\ubjr.c">
-      <Filter>ubj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\ubj\ubjrw.c">
-      <Filter>ubj</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\ubj\ubjw.c">
       <Filter>ubj</Filter>
     </ClCompile>
@@ -196,10 +190,4 @@
   <ItemGroup>
     <CudaCompile Include="..\..\..\src\mcx_core.cu" />
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\zlibstatic.lib" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\zlib.dll" />
-  </ItemGroup>
 </Project>