diff options
| author | Pär Björklund <per@ohmy.nu> | 2016-07-10 22:13:08 +0200 |
|---|---|---|
| committer | Pär Björklund <per@ohmy.nu> | 2016-07-17 15:19:31 +0200 |
| commit | e49c7ec6b4f8dfbe0917df801035872992784438 (patch) | |
| tree | c5feec903e9b9a7174dd3db00767564832b11356 /lib | |
| parent | 2ab7fb1ca2eb72611842c48276b15e4ed0bd225b (diff) | |
Cleanup work that started with running as Win10 app
UWP(project centennial) does not allow AddDllDirectory which
we don't really need anyway but it's use made the folder structure
pretty. Since we run perfectly fine without it both native and
as UWP I decided to drop it completely.
To make the build, installer and debugging experience easier this
led to plenty of changes to packages and build scripts to output
all dlls into /system/ instead of different folders.
While moving stuff around some dependencies got updated, it's possible
that we can use java menus in bluray movies now, not tested.
EasyHook just got repackaged to fit the new folder structure.
The rebuilding of dependencies led to us being able to drop old
vcredist files which also simplifies installer and packaging, especially
for UWP.
Some minor cleanup along the way as well
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cpluff/libcpluff/win32/cpluff.vcxproj | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/cpluff/libcpluff/win32/cpluff.vcxproj b/lib/cpluff/libcpluff/win32/cpluff.vcxproj index 99fb0f509c..6db09841a0 100644 --- a/lib/cpluff/libcpluff/win32/cpluff.vcxproj +++ b/lib/cpluff/libcpluff/win32/cpluff.vcxproj @@ -55,14 +55,14 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_USRDLL;CP_C_API=CP_EXPORT;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>XML_STATIC;_USRDLL;CP_C_API=CP_EXPORT;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>expatd.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary> @@ -79,7 +79,7 @@ <Optimization>Full</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_USRDLL;CP_C_API=CP_EXPORT;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>XML_STATIC;_USRDLL;CP_C_API=CP_EXPORT;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> @@ -88,7 +88,7 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> </ClCompile> <Link> - <AdditionalDependencies>libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>expat.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile> <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary> |