Mercurial > dwib

changeset 361:833d2f2a2b6d

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:04:38 -0500
parents 83381672a010
children 04e182c54dc5
files makefile.emx makefile.vac makefile.vc
diffstat 3 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/makefile.emx	Thu Jun 23 02:34:07 2022 -0500
+++ b/makefile.emx	Tue Jun 28 04:04:38 2022 -0500
@@ -6,8 +6,11 @@
 MAKE = make
 COMPRESS = lxlite
 
-XML2LIBPATH=/usr/lib
-XML2INCPATH=/usr/include/libxml2
+# Edit this as necessary.
+#DWINCDIR=/work/netlabs/dwindows
+#DWLIBDIR=/work/netlabs/dwindows
+#XML2LIBPATH=/usr/lib
+#XML2INCPATH=/usr/include/libxml2
 
 DEFS =
 LIBS =
--- a/makefile.vac	Thu Jun 23 02:34:07 2022 -0500
+++ b/makefile.vac	Tue Jun 28 04:04:38 2022 -0500
@@ -1,8 +1,8 @@
 # Dynamic Windows Interface Builder Makefile
 
 # Edit this as necessary.
-#DWLIBPATH=..\..\dwindows\lib
-#DWINCPATH=..\..\dwindows
+#DWLIBPATH=\work\netlabs\dwindows
+#DWINCPATH=\work\netlabs\dwindows
 #XML2LIBPATH=\usr\lib
 #XML2INCPATH=\usr\include\libxml2
 
@@ -73,14 +73,14 @@
 clean: 
 	rm $(OBJECTS) dwib.exe example.exe os2\dwib.res
 
-# 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 dwib.exe install\package
     lxlite install\package\dwib.exe
-    copy $(DWINCPATH)\dw.dll install\package
+    copy $(DWLIBPATH)\dw.dll install\package
     lxlite install\package\dw.dll
     copy $(XML2LIBPATH)\libxml2.dll install\package
     lxlite install\package\libxml2.dll
--- a/makefile.vc	Thu Jun 23 02:34:07 2022 -0500
+++ b/makefile.vc	Tue Jun 28 04:04:38 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
 #XML2LIBDIR=\lib
 #XML2INCDIR=\include
@@ -68,7 +68,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) -I$(XML2INCDIR) -DLIBXML_STATIC -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 $(XML2LIBDIR)\libxml2_a.lib
+LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib $(DWLIBDIR)\$(TARGET_CPU)\dw.lib $(XML2LIBDIR)\$(TARGET_CPU)\libxml2_a.lib
 RES = 
 LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG)
 DLLLINKFLAGS = -dll