Skip to content

Commit f3ade2d

Browse files
derwin12derwin12
authored
Merge pull request #5996 from derwin12/0000-compile-april02
Back to the original linking errors.. but compiles
2 parents 8aea3e5 + 7664371 commit f3ade2d

4 files changed

Lines changed: 64 additions & 12 deletions

File tree

‎xLights/Xlights.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@
171171
<GenerateMapFile>false</GenerateMapFile>
172172
</Link>
173173
<Manifest>
174-
<AdditionalManifestFiles>xLightsApp64.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
175-
<EnableDpiAwareness>true</EnableDpiAwareness>
174+
<AdditionalManifestFiles>xLightsApp.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
175+
<EnableDpiAwareness>false</EnableDpiAwareness>
176176
</Manifest>
177177
<PostBuildEvent>
178178
<Command>copy "$(SolutionDir)..\bin\*.dll" "$(TargetDir)"
@@ -216,8 +216,8 @@ xcopy /Y /I "$(ProjectDir)..\resources\*.*" "$(TargetDir)resources\"
216216
<GenerateMapFile>false</GenerateMapFile>
217217
</Link>
218218
<Manifest>
219-
<AdditionalManifestFiles>xLightsApp64.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
220-
<EnableDpiAwareness>true</EnableDpiAwareness>
219+
<AdditionalManifestFiles>xLightsApp.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
220+
<EnableDpiAwareness>false</EnableDpiAwareness>
221221
</Manifest>
222222
<PostBuildEvent>
223223
<Command>copy "$(SolutionDir)..\bin\*.dll" "$(TargetDir)"
@@ -250,8 +250,8 @@ xcopy "$(SolutionDir)..\bin64\Vamp\" "$(TargetDir)Vamp\" /e /y /i /r
250250
<GenerateMapFile>false</GenerateMapFile>
251251
</Link>
252252
<Manifest>
253-
<AdditionalManifestFiles>xLightsApp64.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
254-
<EnableDpiAwareness>true</EnableDpiAwareness>
253+
<AdditionalManifestFiles>xLightsApp.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
254+
<EnableDpiAwareness>false</EnableDpiAwareness>
255255
</Manifest>
256256
<PostBuildEvent>
257257
<Command>copy "$(SolutionDir)..\bin\*.dll" "$(TargetDir)"
@@ -291,9 +291,9 @@ xcopy "$(SolutionDir)..\bin64\Vamp\" "$(TargetDir)Vamp\" /e /y /i /r
291291
<GenerateMapFile>true</GenerateMapFile>
292292
</Link>
293293
<Manifest>
294-
<AdditionalManifestFiles>xLightsApp64.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
294+
<AdditionalManifestFiles>xLightsApp.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
295295
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
296-
<EnableDpiAwareness>true</EnableDpiAwareness>
296+
<EnableDpiAwareness>false</EnableDpiAwareness>
297297
</Manifest>
298298
<ManifestResourceCompile>
299299
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
@@ -334,9 +334,9 @@ xcopy "$(SolutionDir)..\bin64\Vamp\" "$(TargetDir)Vamp\" /e /y /i /r
334334
<GenerateMapFile>true</GenerateMapFile>
335335
</Link>
336336
<Manifest>
337-
<AdditionalManifestFiles>xLightsApp64.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
337+
<AdditionalManifestFiles>xLightsApp.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
338338
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
339-
<EnableDpiAwareness>true</EnableDpiAwareness>
339+
<EnableDpiAwareness>false</EnableDpiAwareness>
340340
</Manifest>
341341
<ManifestResourceCompile>
342342
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
@@ -378,9 +378,9 @@ xcopy "$(SolutionDir)..\bin64\Vamp\" "$(TargetDir)Vamp\" /e /y /i /r
378378
<GenerateMapFile>true</GenerateMapFile>
379379
</Link>
380380
<Manifest>
381-
<AdditionalManifestFiles>xLightsApp64.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
381+
<AdditionalManifestFiles>xLightsApp.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
382382
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
383-
<EnableDpiAwareness>true</EnableDpiAwareness>
383+
<EnableDpiAwareness>false</EnableDpiAwareness>
384384
</Manifest>
385385
<ManifestResourceCompile>
386386
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>

‎xLights/effects/OpenGLShaders.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
#ifndef __WXMAC__
1212
#ifdef _WIN32
13+
#ifndef WIN32_LEAN_AND_MEAN
14+
#define WIN32_LEAN_AND_MEAN
15+
#endif
1316
#include <windows.h>
1417
#endif
1518
#include <GL/gl.h>

‎xLights/render/WindowsHardwareVideoReader.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
//#define D3D_DEBUG_INFO
2020
#endif
2121

22+
// Must be defined before windows.h (via d3d11.h) to prevent winsock.h being
23+
// included, which conflicts with winsock2.h included by other translation units.
24+
#ifndef _WINSOCKAPI_
25+
#define _WINSOCKAPI_
26+
#endif
27+
2228
#include <d3d11.h>
2329
#include <D2d1.h>
2430
#include <D2d1helper.h>

‎xLights/xLightsApp64.manifest‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly
3+
xmlns="urn:schemas-microsoft-com:asm.v1"
4+
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
5+
manifestVersion="1.0">
6+
7+
<assemblyIdentity
8+
version="2026.0.0.0"
9+
processorArchitecture="amd64"
10+
name="xLights"
11+
type="win32"
12+
/>
13+
<description>xLights</description>
14+
<dependency>
15+
<dependentAssembly>
16+
<assemblyIdentity
17+
type="win32"
18+
name="Microsoft.Windows.Common-Controls"
19+
version="6.0.0.0"
20+
processorArchitecture="amd64"
21+
publicKeyToken="6595b64144ccf1df"
22+
language="*"
23+
/>
24+
</dependentAssembly>
25+
</dependency>
26+
27+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
28+
<application>
29+
<!-- Windows 10 / Windows 11 -->
30+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
31+
<!-- Windows 8.1 -->
32+
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
33+
<!-- Windows 8 -->
34+
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
35+
</application>
36+
</compatibility>
37+
<asmv3:application>
38+
<asmv3:windowsSettings>
39+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
40+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, system</dpiAwareness>
41+
</asmv3:windowsSettings>
42+
</asmv3:application>
43+
</assembly>

0 commit comments

Comments
 (0)