Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only embed manifest in GUI applications

Browse Source
This commit is contained in:
Maarten Bent
2020-07-27 21:06:12 +02:00
parent 8df97af5fe
commit 40724c4963
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/bakefiles/common.bkl
View File

@@ -434,14 +434,17 @@
the LIBDIRNAME and not any wx libraries installed system-wide. the LIBDIRNAME and not any wx libraries installed system-wide.
--> -->
<ldlibs cond="FORMAT=='autoconf'">$(WX_LDFLAGS)</ldlibs> <ldlibs cond="FORMAT=='autoconf'">$(WX_LDFLAGS)</ldlibs>
<res-define>$(WIN32_DPI_MANIFEST)</res-define>
<ldflags>$(WIN32_DPI_LINKFLAG)</ldflags>
<if cond="FORMAT=='msvc'"> <if cond="FORMAT=='msvc'">
<ldflags>$(LINK_TARGET_CPU)</ldflags> <ldflags>$(LINK_TARGET_CPU)</ldflags>
<define>$(TARGET_CPU_COMPFLAG)</define> <define>$(TARGET_CPU_COMPFLAG)</define>
</if> </if>
</template> </template>
<template id="wx_dpi">
<res-define>$(WIN32_DPI_MANIFEST)</res-define>
<ldflags>$(WIN32_DPI_LINKFLAG)</ldflags>
</template>
<template id="anylib"> <template id="anylib">
<dirname>$(LIBDIRNAME)</dirname> <dirname>$(LIBDIRNAME)</dirname>
<install-to>$(LIBDIR)</install-to> <install-to>$(LIBDIR)</install-to>

2
build/bakefiles/common_samples_intree.bkl
View File

@@ -19,7 +19,7 @@
<define>$(DLLFLAG)</define> <define>$(DLLFLAG)</define>
</template> </template>
<template id="wx_util" template="wx_util_b"> <template id="wx_util" template="wx_util_b,wx_dpi">
<app-type>gui</app-type> <app-type>gui</app-type>
<!-- resource files includes: --> <!-- resource files includes: -->
<include>$(SRCDIR)/$(WXTOPDIR)samples</include> <include>$(SRCDIR)/$(WXTOPDIR)samples</include>