Skip to content

Commit 14140ed

Browse files
committed
Embedded manifest in resource file.
1 parent 3a75c33 commit 14140ed

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ INCDIR=include
44
CXX=cl /nologo
55
LD=link /nologo
66
CXXFLAGS=/c /O1 /I$(INCDIR) /W4 /Zi /DWIN32_LEAN_AND_MEAN /DWINVER=0x0501 /D_WIN32_WINNT=0x0501 /wd4100 /DUNICODE /D_UNICODE /EHsc
7-
LDFLAGS=/subsystem:windows /debug /manifest /incremental:no /opt:REF
8-
LDFLAGS=$(LDFLAGS) "/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'"
7+
LDFLAGS=/subsystem:windows /debug /incremental:no /opt:REF
98
RC=rc /nologo
109
RCFLAGS=/i$(INCDIR)
1110
LIBS=
@@ -78,7 +77,6 @@ $(OUTDIR)\Zalgo.res: Zalgo.rc res\x-sampa.txt res\init.txt
7877

7978
$(DISTDIR)\Zalgo.exe: $(FILES)
8079
$(LD) /out:$@ $(LDFLAGS) $** $(LIBS)
81-
mt.exe -nologo -manifest $@.manifest -outputresource:$@;1 && del $@.manifest || set ERRORLEVEL=0
8280

8381
$(DISTDIR)\hecomes.exe: $(CMDFILE) $(OUTDIR)\hecomes.obj
8482
$(LD) /out:$@ $**

Zalgo.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ RID_ICON ICON Zalgo.ico
44
RID_XSAMPA ZALGO_TEXT "res\\x-sampa.txt"
55
RID_INIT ZALGO_TEXT "res\\init.txt"
66
RID_LOOSE ZALGO_TEXT "res\\loose.txt"
7+
1 24 "res\\commctrl6.manifest"

res/commctrl6.manifest

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
2+
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
3+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
4+
<security>
5+
<requestedPrivileges>
6+
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
7+
</requestedPrivileges>
8+
</security>
9+
</trustInfo>
10+
<dependency>
11+
<dependentAssembly>
12+
<assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*' />
13+
</dependentAssembly>
14+
</dependency>
15+
</assembly>

0 commit comments

Comments
 (0)