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).
Unified · Split
| @@ -5,13 +5,11 @@ LDFLAGS += · 4 unmodified lines | |||
| 5 | ifeq ($(ENABLE64BIT), Yes) | 5 | ifeq ($(ENABLE64BIT), Yes) |
| 6 | ASMFLAGS += -f win64 | 6 | ASMFLAGS += -f win64 |
| 7 | ASMFLAGS_PLATFORM = -DWIN64 | 7 | ASMFLAGS_PLATFORM = -DWIN64 |
| 8 | CFLAGS += -DWIN64 | ||
| 9 | CC = x86_64-w64-mingw32-gcc | 8 | CC = x86_64-w64-mingw32-gcc |
| 10 | CXX = x86_64-w64-mingw32-g++ | 9 | CXX = x86_64-w64-mingw32-g++ |
| 11 | AR = x86_64-w64-mingw32-ar | 10 | AR = x86_64-w64-mingw32-ar |
| 12 | else | 11 | else |
| 13 | ASMFLAGS += -f win32 -DPREFIX | 12 | ASMFLAGS += -f win32 -DPREFIX |
| 14 | CFLAGS += -DWIN32 | ||
| 15 | endif | 13 | endif |
| 16 | EXEEXT = .exe | 14 | EXEEXT = .exe |
| 17 | 15 | ||
| @@ -3,13 +3,10 @@ ifeq ($(ASM_ARCH), x86) · 2 unmodified lines | |||
| 3 | ifeq ($(ENABLE64BIT), Yes) | 3 | ifeq ($(ENABLE64BIT), Yes) |
| 4 | ASMFLAGS += -f win64 | 4 | ASMFLAGS += -f win64 |
| 5 | ASMFLAGS_PLATFORM = -DWIN64 | 5 | ASMFLAGS_PLATFORM = -DWIN64 |
| 6 | CFLAGS += -DWIN64 | ||
| 7 | else | 6 | else |
| 8 | ASMFLAGS += -f win32 -DPREFIX | 7 | ASMFLAGS += -f win32 -DPREFIX |
| 9 | CFLAGS += -DWIN32 | ||
| 10 | endif | 8 | endif |
| 11 | else | 9 | else |
| 12 | CFLAGS += -DWIN32 | ||
| 13 | endif | 10 | endif |
| 14 | ifeq ($(ASM_ARCH), arm) | 11 | ifeq ($(ASM_ARCH), arm) |
| 15 | CCAS = gas-preprocessor.pl -as-type armasm -force-thumb -- armasm | 12 | CCAS = gas-preprocessor.pl -as-type armasm -force-thumb -- armasm |
| @@ -54,7 +54,7 @@ · 53 unmodified lines | |||
| 54 | Optimization="2" | 54 | Optimization="2" |
| 55 | InlineFunctionExpansion="1" | 55 | InlineFunctionExpansion="1" |
| 56 | AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc" | 56 | 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" |
| 58 | StringPooling="true" | 58 | StringPooling="true" |
| 59 | RuntimeLibrary="0" | 59 | RuntimeLibrary="0" |
| 60 | EnableFunctionLevelLinking="true" | 60 | EnableFunctionLevelLinking="true" |
| @@ -134,7 +134,7 @@ · 73 unmodified lines | |||
| 134 | Optimization="2" | 134 | Optimization="2" |
| 135 | InlineFunctionExpansion="1" | 135 | InlineFunctionExpansion="1" |
| 136 | AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc" | 136 | 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" |
| 138 | StringPooling="true" | 138 | StringPooling="true" |
| 139 | RuntimeLibrary="0" | 139 | RuntimeLibrary="0" |
| 140 | EnableFunctionLevelLinking="true" | 140 | EnableFunctionLevelLinking="true" |
| @@ -212,7 +212,7 @@ · 71 unmodified lines | |||
| 212 | Name="VCCLCompilerTool" | 212 | Name="VCCLCompilerTool" |
| 213 | Optimization="0" | 213 | Optimization="0" |
| 214 | AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc" | 214 | 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" |
| 216 | MinimalRebuild="true" | 216 | MinimalRebuild="true" |
| 217 | BasicRuntimeChecks="3" | 217 | BasicRuntimeChecks="3" |
| 218 | RuntimeLibrary="1" | 218 | RuntimeLibrary="1" |
| @@ -291,7 +291,7 @@ · 72 unmodified lines | |||
| 291 | Name="VCCLCompilerTool" | 291 | Name="VCCLCompilerTool" |
| 292 | Optimization="0" | 292 | Optimization="0" |
| 293 | AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc" | 293 | 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" |
| 295 | MinimalRebuild="true" | 295 | MinimalRebuild="true" |
| 296 | BasicRuntimeChecks="3" | 296 | BasicRuntimeChecks="3" |
| 297 | RuntimeLibrary="1" | 297 | RuntimeLibrary="1" |
| @@ -54,7 +54,7 @@ · 53 unmodified lines | |||
| 54 | Optimization="2" | 54 | Optimization="2" |
| 55 | InlineFunctionExpansion="1" | 55 | InlineFunctionExpansion="1" |
| 56 | AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc" | 56 | 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" |
| 58 | StringPooling="true" | 58 | StringPooling="true" |
| 59 | RuntimeLibrary="0" | 59 | RuntimeLibrary="0" |
| 60 | EnableFunctionLevelLinking="true" | 60 | EnableFunctionLevelLinking="true" |
| @@ -154,7 +154,7 @@ · 93 unmodified lines | |||
| 154 | Optimization="2" | 154 | Optimization="2" |
| 155 | InlineFunctionExpansion="1" | 155 | InlineFunctionExpansion="1" |
| 156 | AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc" | 156 | 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" |
| 158 | StringPooling="true" | 158 | StringPooling="true" |
| 159 | RuntimeLibrary="0" | 159 | RuntimeLibrary="0" |
| 160 | EnableFunctionLevelLinking="true" | 160 | EnableFunctionLevelLinking="true" |
| @@ -253,7 +253,7 @@ · 92 unmodified lines | |||
| 253 | Name="VCCLCompilerTool" | 253 | Name="VCCLCompilerTool" |
| 254 | Optimization="0" | 254 | Optimization="0" |
| 255 | AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc" | 255 | 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" |
| 257 | MinimalRebuild="true" | 257 | MinimalRebuild="true" |
| 258 | BasicRuntimeChecks="3" | 258 | BasicRuntimeChecks="3" |
| 259 | RuntimeLibrary="1" | 259 | RuntimeLibrary="1" |
| @@ -350,7 +350,7 @@ · 90 unmodified lines | |||
| 350 | Name="VCCLCompilerTool" | 350 | Name="VCCLCompilerTool" |
| 351 | Optimization="0" | 351 | Optimization="0" |
| 352 | AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc" | 352 | 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" |
| 354 | MinimalRebuild="true" | 354 | MinimalRebuild="true" |
| 355 | BasicRuntimeChecks="3" | 355 | BasicRuntimeChecks="3" |
| 356 | RuntimeLibrary="1" | 356 | RuntimeLibrary="1" |
| @@ -50,7 +50,7 @@ · 49 unmodified lines | |||
| 50 | Optimization="2" | 50 | Optimization="2" |
| 51 | InlineFunctionExpansion="1" | 51 | InlineFunctionExpansion="1" |
| 52 | AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\encoder\core\inc" | 52 | AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\encoder\core\inc" |
| 53 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | 53 | PreprocessorDefinitions="NDEBUG;_CONSOLE" |
| 54 | StringPooling="true" | 54 | StringPooling="true" |
| 55 | RuntimeLibrary="0" | 55 | RuntimeLibrary="0" |
| 56 | EnableFunctionLevelLinking="true" | 56 | EnableFunctionLevelLinking="true" |
| @@ -143,7 +143,7 @@ · 86 unmodified lines | |||
| 143 | Optimization="2" | 143 | Optimization="2" |
| 144 | InlineFunctionExpansion="1" | 144 | InlineFunctionExpansion="1" |
| 145 | AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\encoder\core\inc" | 145 | AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\encoder\core\inc" |
| 146 | PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE" | 146 | PreprocessorDefinitions="NDEBUG;_CONSOLE" |
| 147 | StringPooling="true" | 147 | StringPooling="true" |
| 148 | RuntimeLibrary="0" | 148 | RuntimeLibrary="0" |
| 149 | EnableFunctionLevelLinking="true" | 149 | EnableFunctionLevelLinking="true" |
| @@ -234,7 +234,7 @@ · 84 unmodified lines | |||
| 234 | Name="VCCLCompilerTool" | 234 | Name="VCCLCompilerTool" |
| 235 | Optimization="0" | 235 | Optimization="0" |
| 236 | AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\decoder\core\inc,..\..\..\encoder\core\inc" | 236 | AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\decoder\core\inc,..\..\..\encoder\core\inc" |
| 237 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | 237 | PreprocessorDefinitions="_DEBUG;_CONSOLE" |
| 238 | MinimalRebuild="true" | 238 | MinimalRebuild="true" |
| 239 | BasicRuntimeChecks="3" | 239 | BasicRuntimeChecks="3" |
| 240 | RuntimeLibrary="1" | 240 | RuntimeLibrary="1" |
| @@ -328,7 +328,7 @@ · 87 unmodified lines | |||
| 328 | Name="VCCLCompilerTool" | 328 | Name="VCCLCompilerTool" |
| 329 | Optimization="0" | 329 | Optimization="0" |
| 330 | AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\decoder\core\inc,..\..\..\encoder\core\inc" | 330 | AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc,..\..\..\decoder\core\inc,..\..\..\encoder\core\inc" |
| 331 | PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE" | 331 | PreprocessorDefinitions="_DEBUG;_CONSOLE" |
| 332 | MinimalRebuild="true" | 332 | MinimalRebuild="true" |
| 333 | BasicRuntimeChecks="3" | 333 | BasicRuntimeChecks="3" |
| 334 | RuntimeLibrary="1" | 334 | RuntimeLibrary="1" |
| @@ -53,7 +53,7 @@ · 52 unmodified lines | |||
| 53 | Name="VCCLCompilerTool" | 53 | Name="VCCLCompilerTool" |
| 54 | Optimization="0" | 54 | Optimization="0" |
| 55 | AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" | 55 | AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" |
| 56 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;X86_ASM" | 56 | PreprocessorDefinitions="_DEBUG;_LIB;X86_ASM" |
| 57 | MinimalRebuild="true" | 57 | MinimalRebuild="true" |
| 58 | BasicRuntimeChecks="3" | 58 | BasicRuntimeChecks="3" |
| 59 | RuntimeLibrary="1" | 59 | RuntimeLibrary="1" |
| @@ -133,7 +133,7 @@ · 73 unmodified lines | |||
| 133 | Name="VCCLCompilerTool" | 133 | Name="VCCLCompilerTool" |
| 134 | Optimization="0" | 134 | Optimization="0" |
| 135 | AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" | 135 | AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" |
| 136 | PreprocessorDefinitions="WIN64;_DEBUG;_LIB;X86_ASM" | 136 | PreprocessorDefinitions="_DEBUG;_LIB;X86_ASM" |
| 137 | MinimalRebuild="true" | 137 | MinimalRebuild="true" |
| 138 | BasicRuntimeChecks="3" | 138 | BasicRuntimeChecks="3" |
| 139 | RuntimeLibrary="1" | 139 | RuntimeLibrary="1" |
| @@ -215,7 +215,7 @@ · 75 unmodified lines | |||
| 215 | FavorSizeOrSpeed="1" | 215 | FavorSizeOrSpeed="1" |
| 216 | WholeProgramOptimization="true" | 216 | WholeProgramOptimization="true" |
| 217 | AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" | 217 | AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" |
| 218 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;X86_ASM" | 218 | PreprocessorDefinitions="NDEBUG;_LIB;X86_ASM" |
| 219 | StringPooling="true" | 219 | StringPooling="true" |
| 220 | RuntimeLibrary="0" | 220 | RuntimeLibrary="0" |
| 221 | EnableFunctionLevelLinking="true" | 221 | EnableFunctionLevelLinking="true" |
| @@ -299,7 +299,7 @@ · 77 unmodified lines | |||
| 299 | FavorSizeOrSpeed="1" | 299 | FavorSizeOrSpeed="1" |
| 300 | WholeProgramOptimization="true" | 300 | WholeProgramOptimization="true" |
| 301 | AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" | 301 | AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" |
| 302 | PreprocessorDefinitions="WIN64;NDEBUG;_LIB;X86_ASM" | 302 | PreprocessorDefinitions="NDEBUG;_LIB;X86_ASM" |
| 303 | StringPooling="true" | 303 | StringPooling="true" |
| 304 | RuntimeLibrary="0" | 304 | RuntimeLibrary="0" |
| 305 | EnableFunctionLevelLinking="true" | 305 | EnableFunctionLevelLinking="true" |
| @@ -53,7 +53,7 @@ · 52 unmodified lines | |||
| 53 | Name="VCCLCompilerTool" | 53 | Name="VCCLCompilerTool" |
| 54 | Optimization="0" | 54 | Optimization="0" |
| 55 | AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface" | 55 | 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" |
| 57 | MinimalRebuild="true" | 57 | MinimalRebuild="true" |
| 58 | BasicRuntimeChecks="3" | 58 | BasicRuntimeChecks="3" |
| 59 | RuntimeLibrary="1" | 59 | RuntimeLibrary="1" |
| @@ -152,7 +152,7 @@ · 92 unmodified lines | |||
| 152 | Name="VCCLCompilerTool" | 152 | Name="VCCLCompilerTool" |
| 153 | Optimization="0" | 153 | Optimization="0" |
| 154 | AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface" | 154 | 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" |
| 156 | MinimalRebuild="true" | 156 | MinimalRebuild="true" |
| 157 | BasicRuntimeChecks="3" | 157 | BasicRuntimeChecks="3" |
| 158 | RuntimeLibrary="1" | 158 | RuntimeLibrary="1" |
| @@ -255,7 +255,7 @@ · 96 unmodified lines | |||
| 255 | EnableFiberSafeOptimizations="true" | 255 | EnableFiberSafeOptimizations="true" |
| 256 | WholeProgramOptimization="true" | 256 | WholeProgramOptimization="true" |
| 257 | AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface" | 257 | 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" |
| 259 | StringPooling="true" | 259 | StringPooling="true" |
| 260 | RuntimeLibrary="0" | 260 | RuntimeLibrary="0" |
| 261 | EnableFunctionLevelLinking="true" | 261 | EnableFunctionLevelLinking="true" |
| @@ -360,7 +360,7 @@ · 98 unmodified lines | |||
| 360 | EnableFiberSafeOptimizations="true" | 360 | EnableFiberSafeOptimizations="true" |
| 361 | WholeProgramOptimization="true" | 361 | WholeProgramOptimization="true" |
| 362 | AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface" | 362 | 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" |
| 364 | StringPooling="true" | 364 | StringPooling="true" |
| 365 | RuntimeLibrary="0" | 365 | RuntimeLibrary="0" |
| 366 | EnableFunctionLevelLinking="true" | 366 | EnableFunctionLevelLinking="true" |
| @@ -49,7 +49,7 @@ · 48 unmodified lines | |||
| 49 | Name="VCCLCompilerTool" | 49 | Name="VCCLCompilerTool" |
| 50 | Optimization="0" | 50 | Optimization="0" |
| 51 | AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface" | 51 | AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface" |
| 52 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;" | 52 | PreprocessorDefinitions="_DEBUG;_CONSOLE;" |
| 53 | MinimalRebuild="true" | 53 | MinimalRebuild="true" |
| 54 | BasicRuntimeChecks="3" | 54 | BasicRuntimeChecks="3" |
| 55 | RuntimeLibrary="1" | 55 | RuntimeLibrary="1" |
| @@ -144,7 +144,7 @@ · 88 unmodified lines | |||
| 144 | Optimization="2" | 144 | Optimization="2" |
| 145 | InlineFunctionExpansion="1" | 145 | InlineFunctionExpansion="1" |
| 146 | AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface" | 146 | 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;" |
| 148 | StringPooling="true" | 148 | StringPooling="true" |
| 149 | RuntimeLibrary="0" | 149 | RuntimeLibrary="0" |
| 150 | EnableFunctionLevelLinking="true" | 150 | EnableFunctionLevelLinking="true" |
| @@ -239,7 +239,7 @@ · 88 unmodified lines | |||
| 239 | Name="VCCLCompilerTool" | 239 | Name="VCCLCompilerTool" |
| 240 | Optimization="0" | 240 | Optimization="0" |
| 241 | AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface" | 241 | AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface" |
| 242 | PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE" | 242 | PreprocessorDefinitions="_DEBUG;_CONSOLE" |
| 243 | MinimalRebuild="true" | 243 | MinimalRebuild="true" |
| 244 | BasicRuntimeChecks="3" | 244 | BasicRuntimeChecks="3" |
| 245 | RuntimeLibrary="1" | 245 | RuntimeLibrary="1" |
| @@ -335,7 +335,7 @@ · 89 unmodified lines | |||
| 335 | Optimization="2" | 335 | Optimization="2" |
| 336 | InlineFunctionExpansion="1" | 336 | InlineFunctionExpansion="1" |
| 337 | AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface" | 337 | AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface" |
| 338 | PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE" | 338 | PreprocessorDefinitions="NDEBUG;_CONSOLE" |
| 339 | StringPooling="true" | 339 | StringPooling="true" |
| 340 | RuntimeLibrary="0" | 340 | RuntimeLibrary="0" |
| 341 | EnableFunctionLevelLinking="true" | 341 | EnableFunctionLevelLinking="true" |
| @@ -53,7 +53,7 @@ · 52 unmodified lines | |||
| 53 | Name="VCCLCompilerTool" | 53 | Name="VCCLCompilerTool" |
| 54 | Optimization="0" | 54 | Optimization="0" |
| 55 | AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common" | 55 | AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common" |
| 56 | PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;X86_ASM" | 56 | PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM" |
| 57 | MinimalRebuild="true" | 57 | MinimalRebuild="true" |
| 58 | BasicRuntimeChecks="3" | 58 | BasicRuntimeChecks="3" |
| 59 | RuntimeLibrary="1" | 59 | RuntimeLibrary="1" |
| @@ -138,7 +138,7 @@ · 78 unmodified lines | |||
| 138 | Name="VCCLCompilerTool" | 138 | Name="VCCLCompilerTool" |
| 139 | Optimization="0" | 139 | Optimization="0" |
| 140 | AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common" | 140 | AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common" |
| 141 | PreprocessorDefinitions="WIN64;_DEBUG;_USRDLL;X86_ASM" | 141 | PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM" |
| 142 | MinimalRebuild="true" | 142 | MinimalRebuild="true" |
| 143 | BasicRuntimeChecks="3" | 143 | BasicRuntimeChecks="3" |
| 144 | RuntimeLibrary="1" | 144 | RuntimeLibrary="1" |
| @@ -225,7 +225,7 @@ · 80 unmodified lines | |||
| 225 | EnableIntrinsicFunctions="false" | 225 | EnableIntrinsicFunctions="false" |
| 226 | FavorSizeOrSpeed="1" | 226 | FavorSizeOrSpeed="1" |
| 227 | AdditionalIncludeDirectories="../../../common/inc/;../../interface;../../src/common" | 227 | AdditionalIncludeDirectories="../../../common/inc/;../../interface;../../src/common" |
| 228 | PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;X86_ASM" | 228 | PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM" |
| 229 | RuntimeLibrary="0" | 229 | RuntimeLibrary="0" |
| 230 | EnableFunctionLevelLinking="false" | 230 | EnableFunctionLevelLinking="false" |
| 231 | UsePrecompiledHeader="0" | 231 | UsePrecompiledHeader="0" |
| @@ -315,7 +315,7 @@ · 83 unmodified lines | |||
| 315 | EnableIntrinsicFunctions="false" | 315 | EnableIntrinsicFunctions="false" |
| 316 | FavorSizeOrSpeed="1" | 316 | FavorSizeOrSpeed="1" |
| 317 | AdditionalIncludeDirectories="../../../common/inc/;../../interface;../../src/common" | 317 | AdditionalIncludeDirectories="../../../common/inc/;../../interface;../../src/common" |
| 318 | PreprocessorDefinitions="WIN64;NDEBUG;_USRDLL;X86_ASM" | 318 | PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM" |
| 319 | RuntimeLibrary="0" | 319 | RuntimeLibrary="0" |
| 320 | EnableFunctionLevelLinking="false" | 320 | EnableFunctionLevelLinking="false" |
| 321 | UsePrecompiledHeader="0" | 321 | UsePrecompiledHeader="0" |