oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Windows: Make application manifest available everywhere

Browse Source
This commit is contained in:
Asanka Herath
2010-07-14 01:25:17 -04:00
parent 08b297b785
commit 63597ca3fc
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/windows/assembly/NTMakefile
View File

@@ -33,14 +33,6 @@ RELDIR=packages\windows\assembly
!include ../../../windows/NTMakefile.w32 !include ../../../windows/NTMakefile.w32
! if "$(CPU)"=="i386" || "$(CPU)"=="x86"
MCPU=x86
! elseif "$(CPU)"=="AMD64"
MCPU=amd64
! else
! error Unknown CPU
! endif
# CODESIGN_PKT should be set to the public key token of the code # CODESIGN_PKT should be set to the public key token of the code
# signing certificate in use. You can use : # signing certificate in use. You can use :
# #
@@ -104,7 +96,7 @@ ASMGSSDIR=$(ASMDIR)\Heimdal.GSSAPI
ASMGSSVER=$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(VER_PRODUCT_AUX).$(VER_PRODUCT_PATCH) ASMGSSVER=$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(VER_PRODUCT_AUX).$(VER_PRODUCT_PATCH)
ASMGSSMAN=$(ASMGSSNAME).manifest ASMGSSMAN=$(ASMGSSNAME).manifest
ASMGSSBINS=$(ASMGSSDIR)\libgssapi.dll ASMGSSBINS=$(ASMGSSDIR)\gssapi.dll
$(ASMGSSDIR)\$(ASMGSSMAN).nohash: Heimdal.GSSAPI.manifest.in $(ASMGSSDIR)\$(ASMGSSMAN).nohash: Heimdal.GSSAPI.manifest.in
$(SED) -e "s,[@]name[@],$(ASMGSSNAME),g" \ $(SED) -e "s,[@]name[@],$(ASMGSSNAME),g" \
@@ -145,8 +137,6 @@ test::
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Application manifests # Application manifests
APPMANIFEST=$(INCDIR)\Heimdal.Application.$(MCPU).manifest
all:: $(APPMANIFEST) all:: $(APPMANIFEST)
clean:: clean::

10
windows/NTMakefile.w32
View File

@@ -59,6 +59,14 @@ SRC=$(MAKEDIR)\..\..\..
! error Cant determine source directory ! error Cant determine source directory
!endif !endif
! if "$(CPU)"=="i386" || "$(CPU)"=="x86"
MCPU=x86
! elseif "$(CPU)"=="AMD64"
MCPU=amd64
! else
! error Unknown CPU
! endif
!include "NTMakefile.config" !include "NTMakefile.config"
#---------------------------------------------------------------- #----------------------------------------------------------------
@@ -491,3 +499,5 @@ LIBWIND =$(LIBDIR)\libwind.lib
ASMKRBNAME =Heimdal.Kerberos ASMKRBNAME =Heimdal.Kerberos
ASMGSSNAME =Heimdal.GSSAPI ASMGSSNAME =Heimdal.GSSAPI
APPMANIFEST =$(INCDIR)\Heimdal.Application.$(MCPU).manifest