Mercurial > controlcenter

changeset 94:1c08855e848b

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:05:32 -0500
parents cbdf6378682e
children fbadcd216ec8
files makefile.vac makefile.vc
diffstat 2 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/makefile.vac	Sat Jan 15 18:10:07 2022 -0600
+++ b/makefile.vac	Tue Jun 28 04:05:32 2022 -0500
@@ -1,7 +1,7 @@
-# Control Center OS/2 Makefile
+# Control Center Makefile
 
-#DWLIBPATH=d:\work\netlabs\dwindows\lib
-#DWINCPATH=d:\work\netlabs\dwindows
+#DWLIBPATH=\work\netlabs\dwindows
+#DWINCPATH=\work\netlabs\dwindows
 
 TARGET=cc
 
@@ -42,14 +42,14 @@
 	rc -x2 cc.res cc.exe
 #	lxlite sfx.exe
 
-# 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 cc.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
     cd install
     wic -a ccos2.exe 1 -cpackage -r * -U -s cc.wis
--- a/makefile.vc	Sat Jan 15 18:10:07 2022 -0600
+++ b/makefile.vc	Tue Jun 28 04:05:32 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=cc
@@ -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 iphlpapi.lib $(DWLIBDIR)\dw.lib $(DWLIBDIR)\dwcompat.lib
+LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib iphlpapi.lib $(DWLIBDIR)\$(TARGET_CPU)\dw.lib $(DWLIBDIR)\$(TARGET_CPU)\dwcompat.lib
 RES = 
 LINKFLAGS = -machine:$(TARGET_CPU) -manifest -debug -debugtype:cv
 DLLLINKFLAGS = -dll
@@ -87,8 +87,8 @@
     rd /s /q install\package
     md install\package
     copy cc.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
     cd install\package
     copy ..\cc-$(TARGET_CPU).nsi cc.nsi