Skip to content

Commit fb126cf

Browse files
VictorSpirinVictorSpirin
committed
Uuid and wineditline projects will build with /MD option
1 parent 03263bf commit fb126cf

File tree

2 files changed

+68
-1
lines changed

2 files changed

+68
-1
lines changed

‎build/helpers/dependencies.cmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ CD /D %DEPENDENCIES_SRC_DIR%
7272
7z x %DOWNLOADS_DIR%\wineditline-%EDITLINE_VER%.zip
7373
CD /D wineditline-%EDITLINE_VER%\src
7474
patch -p2 < %ROOT%/patches/wineditline/clipboard_paste.patch || goto :ERROR
75-
CL -I. -c history.c editline.c fn_complete.c || goto :ERROR
75+
CL -I. /MD -c history.c editline.c fn_complete.c || goto :ERROR
7676
LIB /out:edit.lib *.obj || goto :ERROR
7777
MKDIR %DEPENDENCIES_BIN_DIR%\wineditline
7878
MKDIR %DEPENDENCIES_BIN_DIR%\wineditline\include
@@ -140,6 +140,7 @@ rm -rf %DEPENDENCIES_BIN_DIR%\uuid %DEPENDENCIES_SRC_DIR%\ossp_uuid
140140
MKDIR %DEPENDENCIES_BIN_DIR%\uuid
141141
7z x %DOWNLOADS_DIR%\ossp_uuid_1.6.2_win32_source_120608.7z -o%DEPENDENCIES_SRC_DIR%\ -y || GOTO :ERROR
142142
CD /D %DEPENDENCIES_SRC_DIR%\ossp_uuid
143+
patch -p1 < %ROOT%/patches/uuid/oosp_uuid.patch || goto :ERROR
143144
IF %ARCH% == X64 sed -i 's/Win32/x64/g' ossp_uuid.sln || GOTO :ERROR
144145
IF %ARCH% == X64 sed -i 's/Win32/x64/g' ossp_uuid\ossp_uuid.vcxproj || GOTO :ERROR
145146
IF %ARCH% == X64 sed -i 's/Win32/x64/g' example\example.vcxproj || GOTO :ERROR

‎patches/uuid/oosp_uuid.patch

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
diff --git a/example/example.vcxproj b/example/example.vcxproj
2+
index 66d5a2a..4c1d0cf 100644
3+
--- a/example/example.vcxproj
4+
+++ b/example/example.vcxproj
5+
@@ -41,7 +41,7 @@
6+
<ClCompile>
7+
<WarningLevel>Level3</WarningLevel>
8+
<Optimization>Disabled</Optimization>
9+
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
10+
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
11+
<AdditionalIncludeDirectories>$(SolutionDir)\include</AdditionalIncludeDirectories>
12+
</ClCompile>
13+
<Link>
14+
@@ -56,7 +56,7 @@
15+
<Optimization>MaxSpeed</Optimization>
16+
<FunctionLevelLinking>true</FunctionLevelLinking>
17+
<IntrinsicFunctions>true</IntrinsicFunctions>
18+
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
19+
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
20+
<AdditionalIncludeDirectories>$(SolutionDir)\include</AdditionalIncludeDirectories>
21+
</ClCompile>
22+
<Link>
23+
diff --git a/ossp_uuid/ossp_uuid.vcxproj b/ossp_uuid/ossp_uuid.vcxproj
24+
index 357f009..36babd7 100644
25+
--- a/ossp_uuid/ossp_uuid.vcxproj
26+
+++ b/ossp_uuid/ossp_uuid.vcxproj
27+
@@ -41,7 +41,7 @@
28+
<ClCompile>
29+
<WarningLevel>Level3</WarningLevel>
30+
<Optimization>Disabled</Optimization>
31+
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
32+
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
33+
</ClCompile>
34+
<Link>
35+
<GenerateDebugInformation>true</GenerateDebugInformation>
36+
@@ -53,7 +53,7 @@
37+
<Optimization>MaxSpeed</Optimization>
38+
<FunctionLevelLinking>true</FunctionLevelLinking>
39+
<IntrinsicFunctions>true</IntrinsicFunctions>
40+
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
41+
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
42+
</ClCompile>
43+
<Link>
44+
<GenerateDebugInformation>true</GenerateDebugInformation>
45+
diff --git a/uuid_cli/uuid_cli.vcxproj b/uuid_cli/uuid_cli.vcxproj
46+
index 3c3c29a..18c12dd 100644
47+
--- a/uuid_cli/uuid_cli.vcxproj
48+
+++ b/uuid_cli/uuid_cli.vcxproj
49+
@@ -42,7 +42,7 @@
50+
<WarningLevel>Level3</WarningLevel>
51+
<Optimization>Disabled</Optimization>
52+
<AdditionalIncludeDirectories>$(SolutionDir)\ossp_uuid</AdditionalIncludeDirectories>
53+
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
54+
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
55+
</ClCompile>
56+
<Link>
57+
<GenerateDebugInformation>true</GenerateDebugInformation>
58+
@@ -57,7 +57,7 @@
59+
<FunctionLevelLinking>true</FunctionLevelLinking>
60+
<IntrinsicFunctions>true</IntrinsicFunctions>
61+
<AdditionalIncludeDirectories>$(SolutionDir)\ossp_uuid</AdditionalIncludeDirectories>
62+
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
63+
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
64+
</ClCompile>
65+
<Link>
66+
<GenerateDebugInformation>true</GenerateDebugInformation>

0 commit comments

Comments
 (0)