diff options
Diffstat (limited to 'winbuild/libsurvive')
-rw-r--r-- | winbuild/libsurvive/libsurvive.vcxproj | 38 | ||||
-rw-r--r-- | winbuild/libsurvive/libsurvive.vcxproj.filters | 26 |
2 files changed, 34 insertions, 30 deletions
diff --git a/winbuild/libsurvive/libsurvive.vcxproj b/winbuild/libsurvive/libsurvive.vcxproj index dc23907..643cff5 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj +++ b/winbuild/libsurvive/libsurvive.vcxproj @@ -30,27 +30,27 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -77,12 +77,13 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>USE_DOUBLE;MANUAL_REGISTRATION;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\windows;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>USE_DOUBLE;RUNTIME_SYMNUM;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> </Link> + <ProjectReference /> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -90,12 +91,13 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>USE_DOUBLE;MANUAL_REGISTRATION;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\windows;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>USE_DOUBLE;RUNTIME_SYMNUM;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> </Link> + <ProjectReference /> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -105,14 +107,15 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>USE_DOUBLE;MANUAL_REGISTRATION;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\windows;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>USE_DOUBLE;RUNTIME_SYMNUM;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> </Link> + <ProjectReference /> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> @@ -122,28 +125,30 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>USE_DOUBLE;MANUAL_REGISTRATION;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\windows;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>USE_DOUBLE;RUNTIME_SYMNUM;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> </Link> + <ProjectReference /> </ItemDefinitionGroup> <ItemGroup> <Text Include="ReadMe.txt" /> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\redist\CNFGFunctions.c" /> + <ClCompile Include="..\..\redist\CNFGWinDriver.c" /> <ClCompile Include="..\..\redist\crc32.c" /> - <ClCompile Include="..\..\redist\DrawFunctions.c" /> + <ClCompile Include="..\..\redist\hid-windows.c" /> <ClCompile Include="..\..\redist\jsmn.c" /> <ClCompile Include="..\..\redist\json_helpers.c" /> <ClCompile Include="..\..\redist\linmath.c" /> <ClCompile Include="..\..\redist\os_generic.c" /> <ClCompile Include="..\..\redist\puff.c" /> <ClCompile Include="..\..\redist\symbol_enumerator.c" /> - <ClCompile Include="..\..\redist\WinDriver.c" /> <ClCompile Include="..\..\src\ootx_decoder.c" /> <ClCompile Include="..\..\src\poser_charlesslow.c" /> <ClCompile Include="..\..\src\poser_daveortho.c" /> @@ -156,14 +161,13 @@ <ClCompile Include="..\..\src\survive_process.c" /> <ClCompile Include="..\..\src\survive_usb.c" /> <ClCompile Include="..\..\src\survive_vive.c" /> - <ClCompile Include="..\..\windows\hid.c" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\include\libsurvive\poser.h" /> <ClInclude Include="..\..\include\libsurvive\survive.h" /> <ClInclude Include="..\..\include\libsurvive\survive_types.h" /> + <ClInclude Include="..\..\redist\CNFGFunctions.h" /> <ClInclude Include="..\..\redist\crc32.h" /> - <ClInclude Include="..\..\redist\DrawFunctions.h" /> <ClInclude Include="..\..\redist\jsmn.h" /> <ClInclude Include="..\..\redist\json_helpers.h" /> <ClInclude Include="..\..\redist\linmath.h" /> @@ -173,7 +177,7 @@ <ClInclude Include="..\..\src\survive_cal.h" /> <ClInclude Include="..\..\src\survive_config.h" /> <ClInclude Include="..\..\src\survive_internal.h" /> - <ClInclude Include="..\..\windows\hidapi.h" /> + <ClInclude Include="..\hidapi.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/winbuild/libsurvive/libsurvive.vcxproj.filters b/winbuild/libsurvive/libsurvive.vcxproj.filters index 370ce14..0bb9d1b 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj.filters +++ b/winbuild/libsurvive/libsurvive.vcxproj.filters @@ -60,12 +60,6 @@ <ClCompile Include="..\..\redist\puff.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\redist\DrawFunctions.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\redist\WinDriver.c"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\redist\json_helpers.c"> <Filter>Source Files</Filter> </ClCompile> @@ -78,10 +72,16 @@ <ClCompile Include="..\..\redist\symbol_enumerator.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\windows\hid.c"> + <ClCompile Include="..\..\redist\linmath.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\redist\linmath.c"> + <ClCompile Include="..\..\redist\hid-windows.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\redist\CNFGFunctions.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\redist\CNFGWinDriver.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> @@ -110,9 +110,6 @@ <ClInclude Include="..\..\redist\os_generic.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\redist\DrawFunctions.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\redist\json_helpers.h"> <Filter>Header Files</Filter> </ClInclude> @@ -125,10 +122,13 @@ <ClInclude Include="..\..\redist\symbol_enumerator.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\windows\hidapi.h"> + <ClInclude Include="..\..\redist\linmath.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\redist\linmath.h"> + <ClInclude Include="..\hidapi.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\redist\CNFGFunctions.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> |