Mercurial > dwindows

diff makefile.emx @ 174:75bf3051235f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes so you can mix compilers.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 01 Dec 2002 12:59:24 +0000
parents 5e38361f823b
children 10a34404c825
line wrap: on
line diff
--- a/makefile.emx	Sun Dec 01 11:18:14 2002 +0000
+++ b/makefile.emx	Sun Dec 01 12:59:24 2002 +0000
@@ -16,8 +16,8 @@
 RCFLAGS = -r
 
 
-COMPATOBJECTS = compat.obj
-COMPATSOURCES = compat.c
+COMPATOBJECTS = compat.obj dirent.obj
+COMPATSOURCES = compat.c dirent.c
 
 all: dw.dll dwcompat.dll
 
@@ -28,16 +28,21 @@
 	$(CC) $(CFLAGS) -c $<	
 
 dw.dll:  
-	$(CC) $(CFLAGS) $(DEFS) -o dll/dw.dll os2/dw.c $(LDFLAGS) dw.def
-	emximp -o lib/dw.lib dw.def
-
+	$(CC) $(CFLAGS) $(DEFS) -o dw.dll os2/dw.c $(LDFLAGS) dw.def
+	emximp -o dw.lib dw.def
+	cp -f dw.dll ../dll
+	cp -f dw.lib ../lib
+        
 dwcompat.dll:  $(COMPATOBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o dll/dwcompat.dll $(COMPATOBJECTS) $(LDFLAGS) -lsocket dwcompate.def
-	emximp -o lib/dwcompat.lib dwcompate.def
+	$(CC) $(CFLAGS) $(DEFS) -o dwcompat.dll $(COMPATOBJECTS) $(LDFLAGS) -lsocket dwcompat.def
+	emximp -o dwcompat.lib dwcompat.def
+	cp -f dwcompat.dll dll
+	cp -f dwcompat.lib lib
 
 clean: 
 	$(RM) $(OBJECTS) handyftp.exe handyftp.res
 
 dw.obj: dw.c
 compat.obj: compat.c
+dirent.obj: os2/dirent.c