Mercurial > HandyFTP

changeset 156:49dbea50b32a

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 03:58:56 -0500
parents 96775319065a
children 35d2bf9ae680
files src/makefile.emx src/makefile.vac src/makefile.vc
diffstat 3 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/makefile.emx	Sat Jan 15 18:07:57 2022 -0600
+++ b/src/makefile.emx	Tue Jun 28 03:58:56 2022 -0500
@@ -3,7 +3,7 @@
 # HandyFTP Makefile
 
 DWINCDIR = /work/netlabs/dwindows
-DWLIBDIR = /work/netlabs/dwindows/lib
+DWLIBDIR = /work/netlabs/dwindows
 
 CC = gcc
 RM = rm -f
--- a/src/makefile.vac	Sat Jan 15 18:07:57 2022 -0600
+++ b/src/makefile.vac	Tue Jun 28 03:58:56 2022 -0500
@@ -1,8 +1,8 @@
 # HandyFTP Makefile
 
 # Edit this as necessary.
-#DWLIBPATH=..\..\dwindows\lib
-#DWINCPATH=..\..\dwindows
+#DWLIBPATH=\work\netlabs\dwindows
+#DWINCPATH=\work\netlabs\dwindows
 #SFXPATH=..\install
 
 TARGET=handyftp
@@ -47,14 +47,14 @@
 clean: 
 	rm -f $(OBJECTS) handyftp.exe handyftp.res HG.REV
 
-# Create an installer using Installer/2...
-# Packinst and ace2 need to be in the path...
+# Create an installer using WarpIn...
+# wic needs to be in the path...
 installer:
     rm -rf ..\install\package
     md ..\install\package
     copy handyftp.exe ..\install\package
-    copy $(DWINCPATH)\dw.dll ..\install\package
-    copy $(DWINCPATH)\dwcompat.dll ..\install\package
+    copy $(DWLIBPATH)\dw.dll ..\install\package
+    copy $(DWLIBPATH)\dwcompat.dll ..\install\package
     copy ..\readme.txt ..\install\package
     copy ..\install\scripts\license.txt ..\install\package
     copy ..\config\* ..\install\package
--- a/src/makefile.vc	Sat Jan 15 18:07:57 2022 -0600
+++ b/src/makefile.vc	Tue Jun 28 03:58:56 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=handyftp
@@ -66,7 +66,7 @@
 CRT_FLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNING -D_WINSOCK_DEPRECATED_NO_WARNINGS
 
 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)
-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 $(LINK_DEBUG)
 DLLLINKFLAGS = -dll
@@ -97,8 +97,8 @@
     -rd /s /q ..\install\package
     md ..\install\package
     copy handyftp.exe ..\install\package
-    copy $(DWINCDIR)\dw.dll ..\install\package
-    copy $(DWINCDIR)\dwcompat.dll ..\install\package
+    copy $(DWLIBDIR)\$(TARGET_CPU)\dw.dll ..\install\package
+    copy $(DWLIBDIR)\$(TARGET_CPU)\dwcompat.dll ..\install\package
     copy ..\readme.txt ..\install\package
     copy ..\config\* ..\install\package
     xcopy /s ..\help\* ..\install\package