aboutsummaryrefslogtreecommitdiff
path: root/difftool
diff options
context:
space:
mode:
authorDavid Oberhollenzer <goliath@infraroot.at>2020-04-06 23:07:51 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-04-08 03:14:59 +0200
commitc81b424d967203cc2d68e819dc330439e8880764 (patch)
treed075931c780eeddf9a2dc1d8339ef686d60abac3 /difftool
parent4ea1c1e14d8ee67b2e7a6a4665747ccd87fec479 (diff)
Add msvc projects for utility programsfeature/goliath/msvc
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'difftool')
-rw-r--r--difftool/compare_files.c2
-rw-r--r--difftool/sqfsdiff.h5
-rw-r--r--difftool/sqfsdiff.vcxproj188
-rw-r--r--difftool/sqfsdiff.vcxproj.filters44
4 files changed, 237 insertions, 2 deletions
diff --git a/difftool/compare_files.c b/difftool/compare_files.c
index 51b66bb..b25172a 100644
--- a/difftool/compare_files.c
+++ b/difftool/compare_files.c
@@ -13,7 +13,7 @@ static int read_blob(const char *prefix, const char *path,
sqfs_data_reader_t *rd, const sqfs_inode_generic_t *inode,
void *buffer, sqfs_u64 offset, size_t size)
{
- ssize_t ret;
+ sqfs_s32 ret;
ret = sqfs_data_reader_read(rd, inode, offset, buffer, size);
ret = (ret < 0 || (size_t)ret < size) ? -1 : 0;
diff --git a/difftool/sqfsdiff.h b/difftool/sqfsdiff.h
index 94fce93..7f552e9 100644
--- a/difftool/sqfsdiff.h
+++ b/difftool/sqfsdiff.h
@@ -12,10 +12,13 @@
#include "fstree.h"
#include <stdlib.h>
-#include <getopt.h>
#include <string.h>
#include <errno.h>
+#ifdef HAVE_GETOPT_LONG
+#include <getopt.h>
+#endif
+
#define MAX_WINDOW_SIZE (1024 * 1024 * 4)
typedef struct {
diff --git a/difftool/sqfsdiff.vcxproj b/difftool/sqfsdiff.vcxproj
new file mode 100644
index 0000000..5e7d404
--- /dev/null
+++ b/difftool/sqfsdiff.vcxproj
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{7D66EBA3-5EDE-45EB-ADCA-8424C4026CA7}</ProjectGuid>
+ <RootNamespace>sqfsdiff</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories> $(SolutionDir)\include\win32;$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>$(TargetDir)\squashfs.lib;$(TargetDir)\libcompat.lib;$(TargetDir)\libcommon.lib;$(TargetDir)\libfstree.lib;$(TargetDir)\libtar.lib;$(TargetDir)\libutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories> $(SolutionDir)\include\win32;$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>$(TargetDir)\squashfs.lib;$(TargetDir)\libcompat.lib;$(TargetDir)\libcommon.lib;$(TargetDir)\libfstree.lib;$(TargetDir)\libtar.lib;$(TargetDir)\libutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories> $(SolutionDir)\include\win32;$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>$(TargetDir)\squashfs.lib;$(TargetDir)\libcompat.lib;$(TargetDir)\libcommon.lib;$(TargetDir)\libfstree.lib;$(TargetDir)\libtar.lib;$(TargetDir)\libutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories> $(SolutionDir)\include\win32;$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>$(TargetDir)\squashfs.lib;$(TargetDir)\libcompat.lib;$(TargetDir)\libcommon.lib;$(TargetDir)\libfstree.lib;$(TargetDir)\libtar.lib;$(TargetDir)\libutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="compare_dir.c" />
+ <ClCompile Include="compare_files.c" />
+ <ClCompile Include="extract.c" />
+ <ClCompile Include="node_compare.c" />
+ <ClCompile Include="options.c" />
+ <ClCompile Include="sqfsdiff.c" />
+ <ClCompile Include="super.c" />
+ <ClCompile Include="util.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="sqfsdiff.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\lib\common\libcommon.vcxproj">
+ <Project>{4af21b3a-e7a0-48e6-951c-ca442410231f}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\lib\compat\libcompat.vcxproj">
+ <Project>{45dec8f7-f154-4c3e-b616-a21fb3ca8cc2}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\lib\fstree\libfstree.vcxproj">
+ <Project>{4aa93963-2bc8-48fa-80b8-776b1f80bba5}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\lib\sqfs\libsqfs.vcxproj">
+ <Project>{7f732a8e-22a5-4dc1-b8db-7091d37be502}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\lib\tar\libtar.vcxproj">
+ <Project>{73712684-0f79-4ef6-950c-943c0456ff05}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\lib\util\libutil.vcxproj">
+ <Project>{e25396a6-af76-4695-ba23-01d88009b7ec}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project> \ No newline at end of file
diff --git a/difftool/sqfsdiff.vcxproj.filters b/difftool/sqfsdiff.vcxproj.filters
new file mode 100644
index 0000000..18cc471
--- /dev/null
+++ b/difftool/sqfsdiff.vcxproj.filters
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Headers">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Source">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="options.c">
+ <Filter>Source</Filter>
+ </ClCompile>
+ <ClCompile Include="sqfsdiff.c">
+ <Filter>Source</Filter>
+ </ClCompile>
+ <ClCompile Include="super.c">
+ <Filter>Source</Filter>
+ </ClCompile>
+ <ClCompile Include="util.c">
+ <Filter>Source</Filter>
+ </ClCompile>
+ <ClCompile Include="compare_dir.c">
+ <Filter>Source</Filter>
+ </ClCompile>
+ <ClCompile Include="compare_files.c">
+ <Filter>Source</Filter>
+ </ClCompile>
+ <ClCompile Include="extract.c">
+ <Filter>Source</Filter>
+ </ClCompile>
+ <ClCompile Include="node_compare.c">
+ <Filter>Source</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="sqfsdiff.h">
+ <Filter>Headers</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project> \ No newline at end of file