From 076e8757ee775d69a1dad8c5349074d28c9542ef Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 18 Jul 2007 21:28:42 +0000
Subject: [PATCH] Fix for issue 1603 (quickInstall fails to register service on vista)

---
 opends/src/build-tools/windows/Makefile |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/opends/src/build-tools/windows/Makefile b/opends/src/build-tools/windows/Makefile
index 93fd9fa..caa92e1 100644
--- a/opends/src/build-tools/windows/Makefile
+++ b/opends/src/build-tools/windows/Makefile
@@ -44,13 +44,15 @@
 
 CC=cl
 SERVICE_PROGNAME=opends_service.exe
+LAUNCHER_ADMINISTRATOR_PROGNAME=launcher_administrator.exe
 WINLAUNCHER_PROGNAME=winlauncher.exe
-LINKER=link -nologo
+LINKER=link -nologo /machine:x86
 LIBS=advapi32.lib
 
-CFLAGS= -D_WINDOWS  -nologo -MD  -W3 -O2 -G6
+CFLAGS= -D_WINDOWS  -nologo  -W3 -O2
 RC=rc
 MC=mc
+MT=mt
 
 SRCS = common.c winlauncher.c service.c 
 
@@ -65,6 +67,9 @@
 
 RES_FILE = EventLogMsg.res
 
+SERVICE_MANIFEST_FILE = opends_service.exe.manifest
+LAUNCHER_ADMINISTRATOR_MANIFEST_FILE = launcher_administrator.exe.manifest
+
 .c.obj:
   $(CC) $(CFLAGS) -c $< -Fo$@
   
@@ -73,14 +78,19 @@
   $(RC) /fo $(RES_FILE) $(RC_FILE)
 
 
-all: $(SERVICE_PROGNAME) $(WINLAUNCHER_PROGNAME)
+all: $(SERVICE_PROGNAME) $(WINLAUNCHER_PROGNAME) $(LAUNCHER_ADMINISTRATOR_PROGNAME) 
 
 $(SERVICE_PROGNAME) : $(RES_FILE) $(SERVICE_OBJS)
   $(LINKER) /OUT:$(SERVICE_PROGNAME) $(RES_FILE) $(SERVICE_OBJS) $(LIBS)
-
+  $(MT) -manifest "$(SERVICE_MANIFEST_FILE)" -outputresource:"$(SERVICE_PROGNAME)";#1
+  
 $(WINLAUNCHER_PROGNAME) : $(WINLAUNCHER_OBJS)
   $(LINKER) $(WINLAUNCHER_OBJS) /OUT:$(WINLAUNCHER_PROGNAME)
 
+$(LAUNCHER_ADMINISTRATOR_PROGNAME) : $(WINLAUNCHER_OBJS)
+  $(LINKER) $(WINLAUNCHER_OBJS) /OUT:$(LAUNCHER_ADMINISTRATOR_PROGNAME)
+  $(MT) -manifest "$(LAUNCHER_ADMINISTRATOR_MANIFEST_FILE)" -outputresource:"$(LAUNCHER_ADMINISTRATOR_PROGNAME)";#1
+  
 clean:
-  del $(SERVICE_OBJS) $(EVENTLOG_H) $(WINLAUNCHER_OBJS) $(RC_FILE) $(RES_FILE) $(SERVICE_PROGNAME) $(WINLAUNCHER_PROGNAME) core
+  del $(SERVICE_OBJS) $(EVENTLOG_H) $(WINLAUNCHER_OBJS) $(RC_FILE) $(RES_FILE) $(SERVICE_PROGNAME) $(WINLAUNCHER_PROGNAME) $(LAUNCHER_ADMINISTRATOR_PROGNAME) core
 

--
Gitblit v1.10.0