Mercurial > DynamicMail

changeset 16:069e301d5980

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added support for building Dynamic Mail 64bit and manifests.
author Brian Smith <brian@dbsoft.org>
date Thu, 17 Mar 2011 11:02:11 -0500
parents fd3c250e3f65
children 9ada6eb824d9
files makefile.vc minimal/makefile.vc mysql/makefile.vc
diffstat 3 files changed, 53 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/makefile.vc	Wed Mar 16 11:15:09 2011 -0500
+++ b/makefile.vc	Thu Mar 17 11:02:11 2011 -0500
@@ -5,13 +5,27 @@
 #DWLIBDIR=\netlabs\dwindows\lib
 #DWINCDIR=\netlabs\dwindows
 
+#
+# Configure settings for the target platform
+#	Default to x86 if not specified
+#
+!if "$(TARGET_CPU)" == ""
+TARGET_CPU=x86
+!endif
+
+!if "$(TARGET_CPU)" == "x86"
+PLATFORM_DEF = -DWIN32
+!else
+PLATFORM_DEF = -DWIN64
+!endif
+
 CC = cl
-CFLAGS = -c -Zp1 -DWIN32 -D__WIN32__ -DMSVC -I. -I$(DWINCDIR)
+CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -I. -I$(DWINCDIR)
 CFLAGS_DEBUG = -Zi
 CFLAGS_COMPILE = -MTd
 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib $(DWLIBDIR)\dw.lib $(DWLIBDIR)\dwcompat.lib
 RES = 
-LINKFLAGS = -machine:i386 -debug -debugtype:cv
+LINKFLAGS = -machine:$(TARGET_CPU) -manifest -debug -debugtype:cv
 DLLLINKFLAGS = -dll
 LINK = link
 DEFFILE = dmail.def
@@ -51,6 +65,7 @@
 $(LIBS)
 dmailw.res
 <<
+	mt.exe /manifest dmail.exe.manifest /outputresource:dmail.exe;1
         
 .c.obj:
 	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $*.c
--- a/minimal/makefile.vc	Wed Mar 16 11:15:09 2011 -0500
+++ b/minimal/makefile.vc	Thu Mar 17 11:02:11 2011 -0500
@@ -5,13 +5,27 @@
 #DWLIBDIR=\netlabs\dwindows\lib
 #DWINCDIR=\netlabs\dwindows
 
+#
+# Configure settings for the target platform
+#	Default to x86 if not specified
+#
+!if "$(TARGET_CPU)" == ""
+TARGET_CPU=x86
+!endif
+
+!if "$(TARGET_CPU)" == "x86"
+PLATFORM_DEF = -DWIN32
+!else
+PLATFORM_DEF = -DWIN64
+!endif
+
 CC = cl
-CFLAGS = -c -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DBUILD_DLL -I$(DWINCDIR) -I. -I..
+CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DBUILD_DLL -I$(DWINCDIR) -I. -I..
 CFLAGS_DEBUG = -Zi
 CFLAGS_COMPILE = -MTd
 LIBS = $(DWLIBDIR)\dw.lib $(DWLIBDIR)\dwcompat.lib
 RES = 
-LINKFLAGS = -machine:i386 -debug -debugtype:cv
+LINKFLAGS = -machine:$(TARGET_CPU) -manifest -debug -debugtype:cv
 DLLLINKFLAGS = -dll
 LINK = link
 DEFFILE = minimalw.def
@@ -39,7 +53,8 @@
 $(OBJS) $(RES)
 $(LIBS)
 <<
-        copy minimal.dll ..
+    mt.exe /manifest minimal.dll.manifest /outputresource:minimal.dll;2
+    copy minimal.dll ..
 
 .c.obj:
 	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $*.c
--- a/mysql/makefile.vc	Wed Mar 16 11:15:09 2011 -0500
+++ b/mysql/makefile.vc	Thu Mar 17 11:02:11 2011 -0500
@@ -5,13 +5,27 @@
 #DWLIBDIR=\netlabs\dwindows\lib
 #DWINCDIR=\netlabs\dwindows
 
+#
+# Configure settings for the target platform
+#	Default to x86 if not specified
+#
+!if "$(TARGET_CPU)" == ""
+TARGET_CPU=x86
+!endif
+
+!if "$(TARGET_CPU)" == "x86"
+PLATFORM_DEF = -DWIN32
+!else
+PLATFORM_DEF = -DWIN64
+!endif
+
 CC = cl
-CFLAGS = -c -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DBUILD_DLL -I$(DWINCDIR) -I. -I..
+CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DBUILD_DLL -I$(DWINCDIR) -I. -I..
 CFLAGS_DEBUG = -Zi
 CFLAGS_COMPILE = -MTd
 LIBS = $(DWLIBDIR)\dw.lib $(DWLIBDIR)\dwcompat.lib mysqlclient.lib wsock32.lib advapi32.lib user32.lib
 RES = 
-LINKFLAGS = -machine:i386 -debug -debugtype:cv
+LINKFLAGS = -machine:$(TARGET_CPU) -manifest -debug -debugtype:cv
 DLLLINKFLAGS = -dll
 LINK = link
 DEFFILE = mysqlplgw.def
@@ -39,7 +53,8 @@
 $(OBJS) $(RES)
 $(LIBS)
 <<
-        copy mysqlplg.dll ..
+    mt.exe /manifest mysqlplg.dll.manifest /outputresource:mysqlplg.dll;2
+    copy mysqlplg.dll ..
 
 .c.obj:
 	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $*.c