[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 6f24bab 2/2: [builds/windows] Fix up DLG build with V
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2] master 6f24bab 2/2: [builds/windows] Fix up DLG build with VC++. |
Date: |
Thu, 7 Jan 2021 16:58:01 -0500 (EST) |
branch: master
commit 6f24bab68ce14eeef9b6aa46603f9407ba7e940e
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>
[builds/windows] Fix up DLG build with VC++.
* builds/windows/vc2010/script.bat: Copy headers to include/.
* builds/windows/vc2010/freetype.vcxproj: Remove DLG paths.
---
ChangeLog | 7 +++++++
builds/windows/vc2010/freetype.vcxproj | 8 ++++----
builds/windows/vc2010/script.bat | 8 ++++----
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 86871ee..ba8ea08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2021-01-07 Alexei Podtelezhnikov <apodtele@gmail.com>
+ [builds/windows] Fix up DLG build with VC++.
+
+ * builds/windows/vc2010/script.bat: Copy headers to include/.
+ * builds/windows/vc2010/freetype.vcxproj: Remove DLG paths.
+
+2021-01-07 Alexei Podtelezhnikov <apodtele@gmail.com>
+
[builds] Relocate `FTMODULE_H'.
* builds/toplevel.mk: Place `FTMODULE_H' in include/.
diff --git a/builds/windows/vc2010/freetype.vcxproj
b/builds/windows/vc2010/freetype.vcxproj
index 6f63ff9..b259c68 100644
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -206,7 +206,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-
<AdditionalIncludeDirectories>..\..\..\src\dlg;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -233,7 +233,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-
<AdditionalIncludeDirectories>..\..\..\src\dlg;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -260,7 +260,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-
<AdditionalIncludeDirectories>..\..\..\src\dlg;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -287,7 +287,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-
<AdditionalIncludeDirectories>..\..\..\src\dlg;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
diff --git a/builds/windows/vc2010/script.bat b/builds/windows/vc2010/script.bat
index 1c0c7fb..51bd941 100644
--- a/builds/windows/vc2010/script.bat
+++ b/builds/windows/vc2010/script.bat
@@ -4,8 +4,8 @@
cd ..\..\..\
:: Copy dlg's files from `submodules\dlg' to `src\dlg'
-IF NOT EXIST src\dlg\dlg (
- mkdir src\dlg\dlg
- COPY submodules\dlg\include\dlg\dlg.h src\dlg\dlg
- COPY submodules\dlg\include\dlg\output.h src\dlg\dlg
+IF NOT EXIST include\dlg (
+ mkdir include\dlg
+ COPY submodules\dlg\include\dlg\dlg.h include\dlg
+ COPY submodules\dlg\include\dlg\output.h include\dlg
COPY submodules\dlg\src\dlg\dlg.c src\dlg\ )
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 6f24bab 2/2: [builds/windows] Fix up DLG build with VC++.,
Alexei Podtelezhnikov <=