Mercurial > dwindows

changeset 381:0df4ad2ac083

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable dwindows to be built from a directory other than where the source is. Build dwtest.exe when no target specified.
author mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 29 Apr 2003 11:00:49 +0000
parents fcb52d773ed2
children 838781d4f1dc
files makefile.vc
diffstat 1 files changed, 24 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/makefile.vc	Tue Apr 29 10:54:09 2003 +0000
+++ b/makefile.vc	Tue Apr 29 11:00:49 2003 +0000
@@ -1,9 +1,17 @@
 #
+# Get our source directory
+#
+!if "$(DWINDOWS_SRCDIR)" == ""
+SRCDIR=.
+!else
+SRCDIR=$(DWINDOWS_SRCDIR)
+!endif
+
 FXLIBDIR=.\lib
 FXDLLDIR=.\dll
 
 CC = cl
-CFLAGS = -c -G5 -GD -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DBUILD_DLL -I.\platform -I.
+CFLAGS = -c -G5 -GD -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DBUILD_DLL -I$(SRCDIR)\platform -I$(SRCDIR)
 CFLAGS_DEBUG = -Zi
 CFLAGS_COMPILE = -MTd
 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib
@@ -11,14 +19,14 @@
 LINKFLAGS = -machine:i386 -debug:full
 DLLLINKFLAGS = -dll
 LINK = link
-DEFFILE = dww.def
-DEFFILE2 = dwcompatw.def
+DEFFILE = $(SRCDIR)\dww.def
+DEFFILE2 = $(SRCDIR)\dwcompatw.def
 
-OBJS =	dw.obj
+OBJS = dw.obj
 
 OBJS2 = compat.obj dirent.obj
 
-all: dw dwcompat
+all: dw dwcompat dwtest
 
 clean:
 	-erase *.dll
@@ -35,6 +43,8 @@
 dw: dw.dll
 
 dw.dll: $(OBJS) $(DEFFILE)
+	-mkdir $(FXLIBDIR)
+	-mkdir $(FXDLLDIR)
 	$(LINK) @<<
 -out:$(@) -def:$(DEFFILE)
 $(LINKFLAGS) $(DLLLINKFLAGS)
@@ -58,14 +68,17 @@
         copy dwcompat.lib $(FXLIBDIR)\dwcompat.lib
         copy dwcompat.dll $(FXDLLDIR)\dwcompat.dll
 
-dw.obj: win\dw.c
-	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) win\dw.c
+dw.obj: $(SRCDIR)\win\dw.c
+	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\win\dw.c
+
+dirent.obj: $(SRCDIR)\win\dirent.c
+	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\win\dirent.c
 
-dirent.obj: win\dirent.c
-	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) win\dirent.c
+compat.obj: $(SRCDIR)\compat.c
+	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\compat.c
 
-.c.obj:
-	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $*.c
+dwtest.obj: $(SRCDIR)\dwtest.c
+	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\dwtest.c
 
 dwtest: dwtest.exe