From 820eeeb5b357096b61b64e2e300ae9f9e544f39e Mon Sep 17 00:00:00 2001 From: plagman Date: Tue, 11 Sep 2007 00:52:38 +0000 Subject: [PATCH] MANIFESTS MOTHERFUCKER DO YOU EMBED THEM? git-svn-id: https://svn.eduke32.com/eduke32@578 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/Makefile.msvc | 7 ++++++- polymer/eduke32/Makefile.msvc | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/polymer/build/Makefile.msvc b/polymer/build/Makefile.msvc index dbbe5e63e..a03352932 100644 --- a/polymer/build/Makefile.msvc +++ b/polymer/build/Makefile.msvc @@ -119,18 +119,23 @@ $(OBJ)\$(EDITORLIB): $(EDITOROBJS) # the tools kextract$(EXESUFFIX): $(OBJ)\kextract.$o $(OBJ)\compat.$o $(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE /LIBPATH:$(DXROOT)\lib /LIBPATH:$(PLATFORMSDK)\lib" /LIBPATH:$(MSSDKROOT)\lib" $(flags_link) /MAP $** $(LIBS) msvcrt.lib - + $(MT) -manifest $@.manifest -outputresource:$@ + kgroup$(EXESUFFIX): $(OBJ)\kgroup.$o $(OBJ)\compat.$o $(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE /LIBPATH:$(DXROOT)\lib /LIBPATH:$(PLATFORMSDK)\lib" /LIBPATH:$(MSSDKROOT)\lib" $(flags_link) /MAP $** $(LIBS) msvcrt.lib + $(MT) -manifest $@.manifest -outputresource:$@ transpal$(EXESUFFIX): $(OBJ)\transpal.$o $(OBJ)\pragmas.$o $(OBJ)\compat.$o $(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE /LIBPATH:$(DXROOT)\lib /LIBPATH:$(PLATFORMSDK)\lib" /LIBPATH:$(MSSDKROOT)\lib" $(flags_link) /MAP $** $(LIBS) msvcrt.lib + $(MT) -manifest $@.manifest -outputresource:$@ wad2map$(EXESUFFIX): $(OBJ)\wad2map.$o $(OBJ)\pragmas.$o $(OBJ)\compat.$o $(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE /LIBPATH:$(DXROOT)\lib /LIBPATH:$(PLATFORMSDK)\lib" /LIBPATH:$(MSSDKROOT)\lib" $(flags_link) /MAP $** $(LIBS) msvcrt.lib + $(MT) -manifest $@.manifest -outputresource:$@ wad2art$(EXESUFFIX): $(OBJ)\wad2art.$o $(OBJ)\pragmas.$o $(OBJ)\compat.$o $(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE /LIBPATH:$(DXROOT)\lib /LIBPATH:$(PLATFORMSDK)\lib" /LIBPATH:$(MSSDKROOT)\lib" $(flags_link) /MAP $** $(LIBS) msvcrt.lib + $(MT) -manifest $@.manifest -outputresource:$@ # DEPENDENCIES !include Makefile.deps diff --git a/polymer/eduke32/Makefile.msvc b/polymer/eduke32/Makefile.msvc index a870d782a..8f84c1e5f 100644 --- a/polymer/eduke32/Makefile.msvc +++ b/polymer/eduke32/Makefile.msvc @@ -31,6 +31,7 @@ ENGINEOPTS=/DSUPERBUILD /DPOLYMOST /DUSE_OPENGL CC=cl AS=ml LINK=link /opt:nowin98 /nologo /opt:ref +MT=mt CFLAGS= /MD /J /nologo $(flags_cl) \ /I$(INC) /I$(EINC)\ /I$(SRC)\jmact /I$(SRC)\jaudiolib /I..\jfaud\inc /I$(MSSDKROOT)\include" /I$(PLATFORMSDK)\include" \ /DNOCOPYPROTECT /D "_CRT_SECURE_NO_DEPRECATE" -W0 $(ENGINEOPTS) \ @@ -140,13 +141,16 @@ all: eduke32$(EXESUFFIX) mapster32$(EXESUFFIX) duke3d_w32$(EXESUFFIX); eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)\$(ENGINELIB) $(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS /LIBPATH:$(DXROOT)\lib /LIBPATH:$(PLATFORMSDK)\lib" /LIBPATH:$(MSSDKROOT)\lib" $(flags_link) /MAP $** $(LIBS) msvcrt.lib + $(MT) -manifest $@.manifest -outputresource:$@ mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)\$(ENGINELIB) $(EOBJ)\$(EDITORLIB) $(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS /LIBPATH:$(DXROOT)\lib /LIBPATH:$(PLATFORMSDK)\lib" /LIBPATH:$(MSSDKROOT)\lib" $(flags_link) /MAP $** $(LIBS) msvcrt.lib - + $(MT) -manifest $@.manifest -outputresource:$@ + duke3d_w32$(EXESUFFIX): $(OBJ)/wrapper.$o $(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS /LIBPATH:$(DXROOT)\lib /LIBPATH:$(PLATFORMSDK)\lib" /LIBPATH:$(MSSDKROOT)\lib" $(flags_link) /MAP $** $(LIBS) msvcrt.lib - + $(MT) -manifest $@.manifest -outputresource:$@ + !include Makefile.deps enginelib editorlib: AlwaysBuild