diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-04-02 01:02:42 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-04-02 01:02:42 +0200 |
commit | 5de40ee8216c7a3ddb2bf88570f798c8ac4f40f8 (patch) | |
tree | 42254879028fdac21434adb2646487bca8efac5c /lib | |
parent | a2495bd1ac9e5e54074d65616de0efa822a6309e (diff) |
Fix msvc 64 bit build, cleanup configuration
This fixes the msvc 64 bit build configuration which has been
overlooked in the previous commit. The configuration is unified
and the filters file (containing the layout of the files in the
browser) is added. The common definitions are added to config.h.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/sqfs/Makemodule.am | 2 | ||||
-rw-r--r-- | lib/sqfs/libsqfs.vcxproj | 28 | ||||
-rw-r--r-- | lib/sqfs/libsqfs.vcxproj.filters | 252 |
3 files changed, 271 insertions, 11 deletions
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am index 6786ee2..3360e95 100644 --- a/lib/sqfs/Makemodule.am +++ b/lib/sqfs/Makemodule.am @@ -113,5 +113,5 @@ lib_LTLIBRARIES += libsquashfs.la pkgconfig_DATA += lib/sqfs/libsquashfs0.pc EXTRA_DIST += lib/sqfs/comp/lz4/README lib/sqfs/comp/zlib/README -EXTRA_DIST += lib/sqfs/libsqfs.vcxproj +EXTRA_DIST += lib/sqfs/libsqfs.vcxproj lib/sqfs/libsqfs.vcxproj.filters EXTRA_DIST += include/win32/config.h diff --git a/lib/sqfs/libsqfs.vcxproj b/lib/sqfs/libsqfs.vcxproj index 176ba20..1ac84ab 100644 --- a/lib/sqfs/libsqfs.vcxproj +++ b/lib/sqfs/libsqfs.vcxproj @@ -40,13 +40,13 @@ <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v142</PlatformToolset> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v142</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -72,14 +72,16 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <OutDir>$(SolutionDir)$(Configuration)\</OutDir> + <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)$(Configuration)\</OutDir> + <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> @@ -88,11 +90,11 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;WITH_GZIP;WITH_LZ4;NO_GZIP;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;_CONSOLE;NO_GZIP;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\include\win32;$(SolutionDir)\lib\sqfs\comp\zlib;$(SolutionDir)\lib\sqfs\comp\lz4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <CompileAs>CompileAsC</CompileAs> - <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName> + <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -103,8 +105,11 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;_CONSOLE;NO_GZIP;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> + <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName> + <CompileAs>CompileAsC</CompileAs> + <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\include\win32;$(SolutionDir)\lib\sqfs\comp\zlib;$(SolutionDir)\lib\sqfs\comp\lz4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -117,11 +122,11 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;WITH_GZIP;WITH_LZ4;NO_GZIP;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;_CONSOLE;NO_GZIP;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\include\win32;$(SolutionDir)\lib\sqfs\comp\zlib;$(SolutionDir)\lib\sqfs\comp\lz4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <CompileAs>CompileAsC</CompileAs> - <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName> + <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -136,8 +141,11 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;_CONSOLE;NO_GZIP;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> + <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName> + <CompileAs>CompileAsC</CompileAs> + <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\include\win32;$(SolutionDir)\lib\sqfs\comp\zlib;$(SolutionDir)\lib\sqfs\comp\lz4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff --git a/lib/sqfs/libsqfs.vcxproj.filters b/lib/sqfs/libsqfs.vcxproj.filters new file mode 100644 index 0000000..759c118 --- /dev/null +++ b/lib/sqfs/libsqfs.vcxproj.filters @@ -0,0 +1,252 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="dir_reader.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="dir_writer.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="frag_table.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="id_table.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="data_reader.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="block_writer.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="inode.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="win32\io_file.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="meta_reader.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="meta_writer.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="read_inode.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="read_super.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="read_table.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="read_tree.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="readdir.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="write_inode.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="write_super.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="write_table.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="xattr.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="xattr_reader.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="xattr_writer.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="super.c"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="comp\zlib\adler32.c"> + <Filter>zlib</Filter> + </ClCompile> + <ClCompile Include="comp\zlib\deflate.c"> + <Filter>zlib</Filter> + </ClCompile> + <ClCompile Include="comp\zlib\inffast.c"> + <Filter>zlib</Filter> + </ClCompile> + <ClCompile Include="comp\zlib\inflate.c"> + <Filter>zlib</Filter> + </ClCompile> + <ClCompile Include="comp\zlib\inftrees.c"> + <Filter>zlib</Filter> + </ClCompile> + <ClCompile Include="comp\zlib\trees.c"> + <Filter>zlib</Filter> + </ClCompile> + <ClCompile Include="comp\zlib\zutil.c"> + <Filter>zlib</Filter> + </ClCompile> + <ClCompile Include="comp\lz4\lz4.c"> + <Filter>lz4</Filter> + </ClCompile> + <ClCompile Include="comp\lz4\lz4hc.c"> + <Filter>lz4</Filter> + </ClCompile> + <ClCompile Include="comp\gzip.c"> + <Filter>Source\compressor</Filter> + </ClCompile> + <ClCompile Include="comp\lz4.c"> + <Filter>Source\compressor</Filter> + </ClCompile> + <ClCompile Include="comp\compressor.c"> + <Filter>Source\compressor</Filter> + </ClCompile> + <ClCompile Include="block_processor\common.c"> + <Filter>Source\block_processor</Filter> + </ClCompile> + <ClCompile Include="block_processor\winpthread.c"> + <Filter>Source\block_processor</Filter> + </ClCompile> + <ClCompile Include="..\util\alloc.c"> + <Filter>Source\util</Filter> + </ClCompile> + <ClCompile Include="..\util\str_table.c"> + <Filter>Source\util</Filter> + </ClCompile> + <ClCompile Include="..\util\xxhash.c"> + <Filter>Source\util</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\sqfs\block.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\block_processor.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\block_writer.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\compressor.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\win32\config.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\data_reader.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\dir.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\dir_reader.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\dir_writer.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\error.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\frag_table.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\id_table.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\inode.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\io.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\meta_reader.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\meta_writer.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\predef.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\super.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\table.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\xattr.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\xattr_reader.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\include\sqfs\xattr_writer.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="comp\zlib\deflate.h"> + <Filter>zlib</Filter> + </ClInclude> + <ClInclude Include="comp\zlib\inffast.h"> + <Filter>zlib</Filter> + </ClInclude> + <ClInclude Include="comp\zlib\inffixed.h"> + <Filter>zlib</Filter> + </ClInclude> + <ClInclude Include="comp\zlib\inflate.h"> + <Filter>zlib</Filter> + </ClInclude> + <ClInclude Include="comp\zlib\inftrees.h"> + <Filter>zlib</Filter> + </ClInclude> + <ClInclude Include="comp\zlib\trees.h"> + <Filter>zlib</Filter> + </ClInclude> + <ClInclude Include="comp\zlib\zconf.h"> + <Filter>zlib</Filter> + </ClInclude> + <ClInclude Include="comp\zlib\zlib.h"> + <Filter>zlib</Filter> + </ClInclude> + <ClInclude Include="comp\zlib\zutil.h"> + <Filter>zlib</Filter> + </ClInclude> + <ClInclude Include="comp\lz4\lz4.h"> + <Filter>lz4</Filter> + </ClInclude> + <ClInclude Include="comp\lz4\lz4hc.h"> + <Filter>lz4</Filter> + </ClInclude> + <ClInclude Include="comp\internal.h"> + <Filter>Source\compressor</Filter> + </ClInclude> + <ClInclude Include="block_processor\internal.h"> + <Filter>Source\block_processor</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <Filter Include="Headers"> + <UniqueIdentifier>{7491bf84-10be-447e-b7ed-1efe7d8f7ecb}</UniqueIdentifier> + </Filter> + <Filter Include="Source"> + <UniqueIdentifier>{1fcaa3ae-6b0e-47e5-a056-77b9fac9dee5}</UniqueIdentifier> + </Filter> + <Filter Include="zlib"> + <UniqueIdentifier>{68726ace-d1ef-4224-a540-f4389f756ba6}</UniqueIdentifier> + </Filter> + <Filter Include="lz4"> + <UniqueIdentifier>{f744d8a3-0eba-42c6-9893-8fc624cdbb52}</UniqueIdentifier> + </Filter> + <Filter Include="Source\compressor"> + <UniqueIdentifier>{1d8f9cc9-e8b4-45a9-89c3-5e7311aab932}</UniqueIdentifier> + </Filter> + <Filter Include="Source\block_processor"> + <UniqueIdentifier>{42849c38-796f-488a-bcab-f33387d801d5}</UniqueIdentifier> + </Filter> + <Filter Include="Source\util"> + <UniqueIdentifier>{7605c915-b715-4a1c-b329-2234d16d0de1}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file |