History

Don't manually define WIN32/WIN64

All the code that relies on separating them uses the built-in defines _WIN32 and _WIN64, or the corresponding machine defines (such as _M_IX86, for MSVC 32 bit inline assembly).

Martin Storsjö committed 12 years ago

Commit 46352321 parent d63458f9 files · +28 −33Browse files

Unified · Split

9 files
  1. build/platform-mingw_nt.mk +0 −2
  2. build/platform-msvc-common.mk +0 −3
  3. codec/build/win32/dec/WelsDecCore.vcproj +4 −4
  4. codec/build/win32/dec/WelsDecPlus.vcproj +4 −4
  5. codec/build/win32/dec/decConsole.vcproj +4 −4
  6. codec/build/win32/enc/WelsEncCore.vcproj +4 −4
  7. codec/build/win32/enc/WelsEncPlus.vcproj +4 −4
  8. codec/build/win32/enc/encConsole.vcproj +4 −4
  9. codec/processing/build/win32/WelsVP.vcproj +4 −4
build/platform-mingw_nt.mk+0−2
@@ -5,13 +5,11 @@ LDFLAGS += · 4 unmodified lines
55 ifeq ($(ENABLE64BIT), Yes)
66 ASMFLAGS += -f win64
77 ASMFLAGS_PLATFORM = -DWIN64
8−CFLAGS += -DWIN64
98 CC = x86_64-w64-mingw32-gcc
109 CXX = x86_64-w64-mingw32-g++
1110 AR = x86_64-w64-mingw32-ar
1211 else
1312 ASMFLAGS += -f win32 -DPREFIX
14−CFLAGS += -DWIN32
1513 endif
1614 EXEEXT = .exe
1715
build/platform-msvc-common.mk+0−3
@@ -3,13 +3,10 @@ ifeq ($(ASM_ARCH), x86) · 2 unmodified lines
33 ifeq ($(ENABLE64BIT), Yes)
44 ASMFLAGS += -f win64
55 ASMFLAGS_PLATFORM = -DWIN64
6−CFLAGS += -DWIN64
76 else
87 ASMFLAGS += -f win32 -DPREFIX
9−CFLAGS += -DWIN32
108 endif
119 else
12−CFLAGS += -DWIN32
1310 endif
1411 ifeq ($(ASM_ARCH), arm)
1512 CCAS = gas-preprocessor.pl -as-type armasm -force-thumb -- armasm
codec/build/win32/dec/WelsDecCore.vcproj+4−4
@@ -54,7 +54,7 @@ · 53 unmodified lines
5454 Optimization="2"
5555 InlineFunctionExpansion="1"
5656 AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc"
57− PreprocessorDefinitions="WIN32;NDEBUG;_LIB;X86_ASM"
57+ PreprocessorDefinitions="NDEBUG;_LIB;X86_ASM"
5858 StringPooling="true"
5959 RuntimeLibrary="0"
6060 EnableFunctionLevelLinking="true"
@@ -134,7 +134,7 @@ · 73 unmodified lines
134134 Optimization="2"
135135 InlineFunctionExpansion="1"
136136 AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc"
137− PreprocessorDefinitions="WIN64;NDEBUG;_LIB;X86_ASM"
137+ PreprocessorDefinitions="NDEBUG;_LIB;X86_ASM"
138138 StringPooling="true"
139139 RuntimeLibrary="0"
140140 EnableFunctionLevelLinking="true"
@@ -212,7 +212,7 @@ · 71 unmodified lines
212212 Name="VCCLCompilerTool"
213213 Optimization="0"
214214 AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc"
215− PreprocessorDefinitions="WIN32;_DEBUG;_LIB;X86_ASM"
215+ PreprocessorDefinitions="_DEBUG;_LIB;X86_ASM"
216216 MinimalRebuild="true"
217217 BasicRuntimeChecks="3"
218218 RuntimeLibrary="1"
@@ -291,7 +291,7 @@ · 72 unmodified lines
291291 Name="VCCLCompilerTool"
292292 Optimization="0"
293293 AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc"
294− PreprocessorDefinitions="WIN64;_DEBUG;_LIB;X86_ASM"
294+ PreprocessorDefinitions="_DEBUG;_LIB;X86_ASM"
295295 MinimalRebuild="true"
296296 BasicRuntimeChecks="3"
297297 RuntimeLibrary="1"
codec/build/win32/dec/WelsDecPlus.vcproj+4−4
@@ -54,7 +54,7 @@ · 53 unmodified lines
5454 Optimization="2"
5555 InlineFunctionExpansion="1"
5656 AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc"
57− PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;X86_ASM"
57+ PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
5858 StringPooling="true"
5959 RuntimeLibrary="0"
6060 EnableFunctionLevelLinking="true"
@@ -154,7 +154,7 @@ · 93 unmodified lines
154154 Optimization="2"
155155 InlineFunctionExpansion="1"
156156 AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc"
157− PreprocessorDefinitions="WIN64;NDEBUG;_USRDLL;X86_ASM"
157+ PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
158158 StringPooling="true"
159159 RuntimeLibrary="0"
160160 EnableFunctionLevelLinking="true"
@@ -253,7 +253,7 @@ · 92 unmodified lines
253253 Name="VCCLCompilerTool"
254254 Optimization="0"
255255 AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc"
256− PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;X86_ASM"
256+ PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
257257 MinimalRebuild="true"
258258 BasicRuntimeChecks="3"
259259 RuntimeLibrary="1"
@@ -350,7 +350,7 @@ · 90 unmodified lines
350350 Name="VCCLCompilerTool"
351351 Optimization="0"
352352 AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc"
353− PreprocessorDefinitions="WIN64;_DEBUG;_USRDLL;X86_ASM"
353+ PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
354354 MinimalRebuild="true"
355355 BasicRuntimeChecks="3"
356356 RuntimeLibrary="1"
codec/build/win32/dec/decConsole.vcproj+4−4
@@ -50,7 +50,7 @@ · 49 unmodified lines
5050 Optimization="2"
5151 InlineFunctionExpansion="1"
5252 AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\encoder\core\inc"
53− PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
53+ PreprocessorDefinitions="NDEBUG;_CONSOLE"
5454 StringPooling="true"
5555 RuntimeLibrary="0"
5656 EnableFunctionLevelLinking="true"
@@ -143,7 +143,7 @@ · 86 unmodified lines
143143 Optimization="2"
144144 InlineFunctionExpansion="1"
145145 AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\encoder\core\inc"
146− PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
146+ PreprocessorDefinitions="NDEBUG;_CONSOLE"
147147 StringPooling="true"
148148 RuntimeLibrary="0"
149149 EnableFunctionLevelLinking="true"
@@ -234,7 +234,7 @@ · 84 unmodified lines
234234 Name="VCCLCompilerTool"
235235 Optimization="0"
236236 AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\decoder\core\inc,..\..\..\encoder\core\inc"
237− PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
237+ PreprocessorDefinitions="_DEBUG;_CONSOLE"
238238 MinimalRebuild="true"
239239 BasicRuntimeChecks="3"
240240 RuntimeLibrary="1"
@@ -328,7 +328,7 @@ · 87 unmodified lines
328328 Name="VCCLCompilerTool"
329329 Optimization="0"
330330 AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\decoder\core\inc,..\..\..\encoder\core\inc"
331− PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
331+ PreprocessorDefinitions="_DEBUG;_CONSOLE"
332332 MinimalRebuild="true"
333333 BasicRuntimeChecks="3"
334334 RuntimeLibrary="1"
codec/build/win32/enc/WelsEncCore.vcproj+4−4
@@ -53,7 +53,7 @@ · 52 unmodified lines
5353 Name="VCCLCompilerTool"
5454 Optimization="0"
5555 AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface"
56− PreprocessorDefinitions="WIN32;_DEBUG;_LIB;X86_ASM"
56+ PreprocessorDefinitions="_DEBUG;_LIB;X86_ASM"
5757 MinimalRebuild="true"
5858 BasicRuntimeChecks="3"
5959 RuntimeLibrary="1"
@@ -133,7 +133,7 @@ · 73 unmodified lines
133133 Name="VCCLCompilerTool"
134134 Optimization="0"
135135 AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface"
136− PreprocessorDefinitions="WIN64;_DEBUG;_LIB;X86_ASM"
136+ PreprocessorDefinitions="_DEBUG;_LIB;X86_ASM"
137137 MinimalRebuild="true"
138138 BasicRuntimeChecks="3"
139139 RuntimeLibrary="1"
@@ -215,7 +215,7 @@ · 75 unmodified lines
215215 FavorSizeOrSpeed="1"
216216 WholeProgramOptimization="true"
217217 AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface"
218− PreprocessorDefinitions="WIN32;NDEBUG;_LIB;X86_ASM"
218+ PreprocessorDefinitions="NDEBUG;_LIB;X86_ASM"
219219 StringPooling="true"
220220 RuntimeLibrary="0"
221221 EnableFunctionLevelLinking="true"
@@ -299,7 +299,7 @@ · 77 unmodified lines
299299 FavorSizeOrSpeed="1"
300300 WholeProgramOptimization="true"
301301 AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface"
302− PreprocessorDefinitions="WIN64;NDEBUG;_LIB;X86_ASM"
302+ PreprocessorDefinitions="NDEBUG;_LIB;X86_ASM"
303303 StringPooling="true"
304304 RuntimeLibrary="0"
305305 EnableFunctionLevelLinking="true"
codec/build/win32/enc/WelsEncPlus.vcproj+4−4
@@ -53,7 +53,7 @@ · 52 unmodified lines
5353 Name="VCCLCompilerTool"
5454 Optimization="0"
5555 AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface"
56− PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;X86_ASM"
56+ PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
5757 MinimalRebuild="true"
5858 BasicRuntimeChecks="3"
5959 RuntimeLibrary="1"
@@ -152,7 +152,7 @@ · 92 unmodified lines
152152 Name="VCCLCompilerTool"
153153 Optimization="0"
154154 AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface"
155− PreprocessorDefinitions="WIN64;_DEBUG;_USRDLL;X86_ASM"
155+ PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
156156 MinimalRebuild="true"
157157 BasicRuntimeChecks="3"
158158 RuntimeLibrary="1"
@@ -255,7 +255,7 @@ · 96 unmodified lines
255255 EnableFiberSafeOptimizations="true"
256256 WholeProgramOptimization="true"
257257 AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface"
258− PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;X86_ASM"
258+ PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
259259 StringPooling="true"
260260 RuntimeLibrary="0"
261261 EnableFunctionLevelLinking="true"
@@ -360,7 +360,7 @@ · 98 unmodified lines
360360 EnableFiberSafeOptimizations="true"
361361 WholeProgramOptimization="true"
362362 AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface"
363− PreprocessorDefinitions="WIN64;NDEBUG;_USRDLL;X86_ASM"
363+ PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
364364 StringPooling="true"
365365 RuntimeLibrary="0"
366366 EnableFunctionLevelLinking="true"
codec/build/win32/enc/encConsole.vcproj+4−4
@@ -49,7 +49,7 @@ · 48 unmodified lines
4949 Name="VCCLCompilerTool"
5050 Optimization="0"
5151 AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface"
52− PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
52+ PreprocessorDefinitions="_DEBUG;_CONSOLE;"
5353 MinimalRebuild="true"
5454 BasicRuntimeChecks="3"
5555 RuntimeLibrary="1"
@@ -144,7 +144,7 @@ · 88 unmodified lines
144144 Optimization="2"
145145 InlineFunctionExpansion="1"
146146 AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface"
147− PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;X86_ASM;"
147+ PreprocessorDefinitions="NDEBUG;_CONSOLE;X86_ASM;"
148148 StringPooling="true"
149149 RuntimeLibrary="0"
150150 EnableFunctionLevelLinking="true"
@@ -239,7 +239,7 @@ · 88 unmodified lines
239239 Name="VCCLCompilerTool"
240240 Optimization="0"
241241 AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface"
242− PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
242+ PreprocessorDefinitions="_DEBUG;_CONSOLE"
243243 MinimalRebuild="true"
244244 BasicRuntimeChecks="3"
245245 RuntimeLibrary="1"
@@ -335,7 +335,7 @@ · 89 unmodified lines
335335 Optimization="2"
336336 InlineFunctionExpansion="1"
337337 AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface"
338− PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
338+ PreprocessorDefinitions="NDEBUG;_CONSOLE"
339339 StringPooling="true"
340340 RuntimeLibrary="0"
341341 EnableFunctionLevelLinking="true"
codec/processing/build/win32/WelsVP.vcproj+4−4
@@ -53,7 +53,7 @@ · 52 unmodified lines
5353 Name="VCCLCompilerTool"
5454 Optimization="0"
5555 AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common"
56− PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;X86_ASM"
56+ PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
5757 MinimalRebuild="true"
5858 BasicRuntimeChecks="3"
5959 RuntimeLibrary="1"
@@ -138,7 +138,7 @@ · 78 unmodified lines
138138 Name="VCCLCompilerTool"
139139 Optimization="0"
140140 AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common"
141− PreprocessorDefinitions="WIN64;_DEBUG;_USRDLL;X86_ASM"
141+ PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
142142 MinimalRebuild="true"
143143 BasicRuntimeChecks="3"
144144 RuntimeLibrary="1"
@@ -225,7 +225,7 @@ · 80 unmodified lines
225225 EnableIntrinsicFunctions="false"
226226 FavorSizeOrSpeed="1"
227227 AdditionalIncludeDirectories="../../../common/inc/;../../interface;../../src/common"
228− PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;X86_ASM"
228+ PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
229229 RuntimeLibrary="0"
230230 EnableFunctionLevelLinking="false"
231231 UsePrecompiledHeader="0"
@@ -315,7 +315,7 @@ · 83 unmodified lines
315315 EnableIntrinsicFunctions="false"
316316 FavorSizeOrSpeed="1"
317317 AdditionalIncludeDirectories="../../../common/inc/;../../interface;../../src/common"
318− PreprocessorDefinitions="WIN64;NDEBUG;_USRDLL;X86_ASM"
318+ PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
319319 RuntimeLibrary="0"
320320 EnableFunctionLevelLinking="false"
321321 UsePrecompiledHeader="0"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t