Mercurial > DynamicMail

changeset 51:80413c31d0b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle the removal of lib/dll directories on OS/2 and Windows.... and the introduction of platform directories on Windows.
author Brian Smith <brian@dbsoft.org>
date Tue, 28 Jun 2022 04:06:05 -0500
parents cef552476574
children 02f7f88e3880
files makefile.vac makefile.vc minimal/makefile.vc mysql/makefile.vc
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/makefile.vac	Mon Dec 20 18:35:26 2021 -0600
+++ b/makefile.vac	Tue Jun 28 04:06:05 2022 -0500
@@ -1,8 +1,8 @@
 # DynamicMail Makefile
 
 # Edit this as necessary.
-#DWLIBPATH=d:\work\netlabs\dwindows\lib
-#DWINCPATH=d:\work\netlabs\dwindows
+#DWLIBPATH=\work\netlabs\dwindows
+#DWINCPATH=\work\netlabs\dwindows
 
 TARGET=dmail
 
--- a/makefile.vc	Mon Dec 20 18:35:26 2021 -0600
+++ b/makefile.vc	Tue Jun 28 04:06:05 2022 -0500
@@ -2,7 +2,7 @@
 
 # Either add environment variables for DWLIBDIR and DWINCDIR or
 # Uncomment and change these as needed
-#DWLIBDIR=\netlabs\dwindows\lib
+#DWLIBDIR=\netlabs\dwindows
 #DWINCDIR=\netlabs\dwindows
 
 TARGET=dmail
@@ -57,7 +57,7 @@
 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -D__TARGET__=\"$(TARGET)\" -I. -I$(DWINCDIR) -DVER_MAJ=$(VER_MAJ) -D VER_MIN=$(VER_MIN) -DVER_REV=$(VER_REV) $(CRT_FLAGS)
 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
+LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib $(DWLIBDIR)\$(TARGET_CPU)\dw.lib $(DWLIBDIR)\$(TARGET_CPU)\dwcompat.lib
 RES = 
 LINKFLAGS = -machine:$(TARGET_CPU) -manifest -debug -debugtype:cv
 DLLLINKFLAGS = -dll
--- a/minimal/makefile.vc	Mon Dec 20 18:35:26 2021 -0600
+++ b/minimal/makefile.vc	Tue Jun 28 04:06:05 2022 -0500
@@ -2,7 +2,7 @@
 
 # Either add environment variables for DWLIBDIR and DWINCDIR or
 # Uncomment and change these as needed
-#DWLIBDIR=\netlabs\dwindows\lib
+#DWLIBDIR=\netlabs\dwindows
 #DWINCDIR=\netlabs\dwindows
 
 # Configure alternate compiler based on Clang/LLVM
@@ -45,7 +45,7 @@
 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DBUILD_DLL -I$(DWINCDIR) -I. -I.. $(CRT_FLAGS)
 CFLAGS_DEBUG = -Zi
 CFLAGS_COMPILE = -MTd
-LIBS = $(DWLIBDIR)\dw.lib $(DWLIBDIR)\dwcompat.lib
+LIBS = $(DWLIBDIR)\$(TARGET_CPU)\dw.lib $(DWLIBDIR)\$(TARGET_CPU)\dwcompat.lib
 RES = 
 LINKFLAGS = -machine:$(TARGET_CPU) -manifest -debug -debugtype:cv
 DLLLINKFLAGS = -dll
--- a/mysql/makefile.vc	Mon Dec 20 18:35:26 2021 -0600
+++ b/mysql/makefile.vc	Tue Jun 28 04:06:05 2022 -0500
@@ -2,7 +2,7 @@
 
 # Either add environment variables for DWLIBDIR and DWINCDIR or
 # Uncomment and change these as needed
-#DWLIBDIR=\netlabs\dwindows\lib
+#DWLIBDIR=\netlabs\dwindows
 #DWINCDIR=\netlabs\dwindows
 
 # Configure alternate compiler based on Clang/LLVM
@@ -45,7 +45,7 @@
 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DBUILD_DLL -I$(DWINCDIR) -I. -I.. $(CRT_FLAGS)
 CFLAGS_DEBUG = -Zi
 CFLAGS_COMPILE = -MTd
-LIBS = $(DWLIBDIR)\dw.lib $(DWLIBDIR)\dwcompat.lib mysqlclient.lib wsock32.lib advapi32.lib user32.lib
+LIBS = $(DWLIBDIR)\$(TARGET_CPU)\dw.lib $(DWLIBDIR)\$(TARGET_CPU)\dwcompat.lib mysqlclient.lib wsock32.lib advapi32.lib user32.lib
 RES = 
 LINKFLAGS = -machine:$(TARGET_CPU) -manifest -debug -debugtype:cv
 DLLLINKFLAGS = -dll