set descent in GetTextExtend; use PANGO_PIXELS instead of dividing by PANGO_SCALE

[wxWidgets.git] / src / makeprog.vc

diff --git a/src/makeprog.vc b/src/makeprog.vc
index f33a3f4ad1be1a4947a0248b2ece50fc15b21dde..e2c76535c4c6804caccddeca981a1b1b9243fe2c 100644 (file)
--- a/src/makeprog.vc
+++ b/src/makeprog.vc
@@ -13,7 +13,9 @@
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 
+!ifndef WXUSINGDLL
 WXUSINGDLL=0
+!endif
 
 !include $(WXDIR)\src\makevc.env
 
@@ -38,7 +40,11 @@ wxclean:
 wxUSE_GUI=1
 !endif
 
-!if "$(wxUSE_GUI)" == "1" 
+!if "$(wxUSE_GUI)" == "1"
+
+#!if "$(WXUSINGDLL)" == "1"
+DUMMYOBJ=
+#!endif
 
 $(PROGRAM).exe:      $(WXLIB) $(OBJECTS) $(PROGRAM).res
        $(link) @<<
@@ -65,7 +71,7 @@ $(LIBS)
 
 
 clean:
-        -$(RM) $(OBJECTS)
+        -$(RM) *.obj
         -$(RM) *.exe
         -$(RM) *.res
         -$(RM) *.map