# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1321305741 0
# Node ID d4c874f13e9b446fe19c149f20e98de40db72d21
# Parent  b4a23eab81fa53f5d1e39688d82612c37d2971cf
More fixes for OS/2 gcc/gmake.  Need to use := to evaluate the $(shell) variable.
Fixed a few OS/2 gcc warnings in dwtest.

diff -r b4a23eab81fa -r d4c874f13e9b dwtest.c
--- a/dwtest.c	Mon Nov 14 17:31:59 2011 +0000
+++ b/dwtest.c	Mon Nov 14 21:22:21 2011 +0000
@@ -428,7 +428,7 @@
            int nrows;
            
            /* Calculate new dimensions */
-           dw_font_text_extents_get(NULL, pixmap, "(g", NULL, &fheight);
+           dw_font_text_extents_get(0, pixmap, "(g", NULL, &fheight);
            nrows = (int)(DW_PIXMAP_HEIGHT(pixmap) / fheight);
        
            /* Do the actual drawing */
@@ -440,14 +440,14 @@
            char *text = "No file currently selected!";
            int posx, posy;
            
-           dw_font_text_extents_get(NULL, pixmap, text, &fwidth, &fheight);
+           dw_font_text_extents_get(0, pixmap, text, &fwidth, &fheight);
            
            posx = (int)(DW_PIXMAP_WIDTH(pixmap) - fwidth)/2;
            posy = (int)(DW_PIXMAP_HEIGHT(pixmap) - fheight)/2;
            
            dw_color_foreground_set(DW_CLR_BLACK);
            dw_color_background_set(DW_CLR_WHITE);
-           dw_draw_text(NULL, pixmap, posx, posy, text);
+           dw_draw_text(0, pixmap, posx, posy, text);
        }
    }
    return TRUE;
diff -r b4a23eab81fa -r d4c874f13e9b makefile.emx
--- a/makefile.emx	Mon Nov 14 17:31:59 2011 +0000
+++ b/makefile.emx	Mon Nov 14 21:22:21 2011 +0000
@@ -9,7 +9,7 @@
 COMPRESS = lxlite
 VER = 21
 VERDOT = 2.1
-AVERREV = $(shell os2\svnrev.cmd)
+AVERREV := $(shell os2\svnrev.cmd)
 include SVN.REV
 
 DEFS =
@@ -45,7 +45,7 @@
 	$(CC) $(CFLAGS) -Zomf -Zmt -static-libgcc -o dwtest.exe dwtest.o -Llib -ldw -ldwcompat dwtest.def
 
 clean:
-	$(RM) $(OBJECTS) dwtest.exe dw.dll dwcompat.dll
+	$(RM) *.obj *.o *.lib *.res *~ dwtest.exe dw.dll dwcompat.dll SVN.REV
 
 dw.obj: dw.c
 	$(CC) $(CFLAGS) -c $<