1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
|
diff --git a/build.bat b/build.bat
index 50ad683..ddf5e4d 100644
--- a/build.bat
+++ b/build.bat
@@ -365,7 +365,7 @@ IF /I "%~2" == "Win32" (
PUSHD "%BIN_DIR%"
-SET "PCKG_NAME=%NAME%.%MPCHC_VER%.%ARCH%"
+SET "PCKG_NAME=%NAME%.%MPCHC_VER%.%ARCH%.ICL13"
IF DEFINED MPCHC_LITE (SET "PCKG_NAME=%PCKG_NAME%.Lite")
IF /I "%COMPILER%" == "VS2012" (SET "PCKG_NAME=%PCKG_NAME%.%COMPILER%")
diff --git a/distrib/mpc-hc_setup.iss b/distrib/mpc-hc_setup.iss
index aa1cc36..620ee16 100644
--- a/distrib/mpc-hc_setup.iss
+++ b/distrib/mpc-hc_setup.iss
@@ -41,7 +41,7 @@
#define localize = "true"
#endif
#endif
-#define sse_required
+#define sse2_required
; From now on you shouldn't need to change anything
@@ -81,6 +81,8 @@
#define OutFilename = app_name + "." + app_ver + ".x86"
#endif
+#define OutFilename = OutFilename + ".ICL13"
+
#ifnexist bindir + "\" + mpchc_exe
#error Compile MPC-HC first
#endif
@@ -109,6 +111,9 @@
#ifdef MPCHC_LITE
#define FullAppNameVer = FullAppNameVer + " " + "Lite"
#endif
+
+#define FullAppNameVer = FullAppNameVer + " " + "ICL13"
+
#ifdef x64Build
#define FullAppNameVer = FullAppNameVer + " " + "(64-bit)"
#endif
diff --git a/docs/Readme.txt b/docs/Readme.txt
index 8e4ed5e..5c47921 100644
--- a/docs/Readme.txt
+++ b/docs/Readme.txt
@@ -27,7 +27,7 @@ Main Features:
System Requirements:
---------------------
-* An SSE capable CPU
+* An SSE2 capable CPU
* Windows XP SP3, Vista, 7, 8 32-bit/64-bit
diff --git a/src/common.props b/src/common.props
index d1ae499..910b23b 100644
--- a/src/common.props
+++ b/src/common.props
@@ -46,11 +46,14 @@
<SubSystem>Windows</SubSystem>
<TargetMachine Condition="'$(Platform)'=='Win32'">MachineX86</TargetMachine>
<TargetMachine Condition="'$(Platform)'=='x64'">MachineX64</TargetMachine>
+ <WPOAsmListLocation>$(IntDir)</WPOAsmListLocation>
+ <WPOObjectFile>$(IntDir)</WPOObjectFile>
</Link>
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Debug Filter' Or '$(Configuration)'=='Debug Lite'">
@@ -72,24 +75,27 @@
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Release Filter' Or '$(Configuration)'=='Release Lite'">
<ClCompile>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <EnableEnhancedInstructionSet Condition="'$(Platform)'=='Win32'">StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <DisableSpecificDiagnostics>597,997,13200</DisableSpecificDiagnostics>
+ <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+ <FloatingPointModel>Fast</FloatingPointModel>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers Condition="'$(Platform)'=='Win32'">true</OmitFramePointers>
- <Optimization>MaxSpeed</Optimization>
+ <Optimization>MaxSpeedHighLevel</Optimization>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<StringPooling>true</StringPooling>
- <WholeProgramOptimization Condition="'$(UseLTCG)'=='true'">true</WholeProgramOptimization>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Lib>
- <LinkTimeCodeGeneration Condition="'$(UseLTCG)'=='true'">true</LinkTimeCodeGeneration>
+ <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LargeAddressAware Condition="'$(Platform)'=='Win32'">true</LargeAddressAware>
- <LinkTimeCodeGeneration Condition="'$(UseLTCG)'=='true'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<MergeSections>.rdata=.text</MergeSections>
<OptimizeReferences>true</OptimizeReferences>
<SetChecksum>true</SetChecksum>
diff --git a/src/filters/transform/VSFilter/installer/vsfilter_setup.iss b/src/filters/transform/VSFilter/installer/vsfilter_setup.iss
index 16d9cc7..2f9cf41 100644
--- a/src/filters/transform/VSFilter/installer/vsfilter_setup.iss
+++ b/src/filters/transform/VSFilter/installer/vsfilter_setup.iss
@@ -25,7 +25,7 @@
#endif
; If you want to compile the 64-bit version define "x64Build" (uncomment the define below or use build.bat)
-#define sse_required
+#define sse2_required
;#define VS2012
;#define x64Build
@@ -58,6 +58,8 @@
#define OutFilename = app_name + "_" + app_version + "_x86"
#endif
+#define OutFilename = OutFilename + ".ICL13"
+
#ifnexist bindir + "\VSFilter.dll"
#error Compile VSFilter first
#endif
@@ -75,6 +77,9 @@
#if MPC_BETA_RELEASE
#define FullAppNameVer = FullAppNameVer + " " + str(MPC_VERSION_BETA)
#endif
+
+#define FullAppNameVer = FullAppNameVer + " " + "ICL13"
+
#ifdef x64Build
#define FullAppNameVer = FullAppNameVer + " " + "(64-bit)"
#endif
diff --git a/src/platform.props b/src/platform.props
index 09927fd..26091c9 100644
--- a/src/platform.props
+++ b/src/platform.props
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)'=='11.0'">
- <PlatformToolset>v110_xp</PlatformToolset>
+ <PropertyGroup Label="Configuration">
+ <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>
</PropertyGroup>
</Project>
diff --git a/src/thirdparty/ffmpeg/Makefile b/src/thirdparty/ffmpeg/Makefile
index b684c3d..abe7607 100644
--- a/src/thirdparty/ffmpeg/Makefile
+++ b/src/thirdparty/ffmpeg/Makefile
@@ -58,7 +58,7 @@ ifeq ($(64BIT),yes)
else
TARGET_OS = i686-w64-mingw32
CFLAGS += -DWIN32 -D_WIN32 -DARCH_X86_32
- OPTFLAGS += -m32 -march=i686 -mmmx -msse -mfpmath=sse
+ OPTFLAGS += -m32 -march=i686 -mmmx -msse -msse2 -mfpmath=sse
YASMFLAGS += -f win32 -m x86 -DWIN32=1 -DARCH_X86_32=1 -DARCH_X86_64=0 -DPREFIX
endif
|
