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

[wxWidgets.git] / src / makeprog.sc

diff --git a/src/makeprog.sc b/src/makeprog.sc
index 1e5289068e0a1ca30c3131893e2504bb466935d7..165c33ca60e96fdd41b3b73d8721c3e92c7f727b 100644 (file)
--- a/src/makeprog.sc
+++ b/src/makeprog.sc
@@ -6,18 +6,23 @@ INCLUDE=$(INCDIR)
 
 include $(WXDIR)\src\makesc.env
 
-$(TARGET).exe: $(TARGET).obj $(TARGET).res
-       link $(LDFLAGS) $*, $@, $*, $(LIBS)
+$(TARGET).exe: $(OBJECTS) $(TARGET).res
+       link $(LDFLAGS) /DELEXECUTABLE /RC -L/exet:nt/su:windows $(OBJECTS), $@, $*, $(LIBDIR)\ $(LIBS)
     
 
-sc32.def:
-     echo EXETYPE NT > sc32.def
-     echo SUBSYSTEM WINDOWS >> sc32.def
-
 clean:
     -del *.obj
        -del *.exe
        -del *.res
        -del *.map
        -del *.rws
-    -del sc16.def
+    -del *.sym
+
+
+cleanexe:
+    -del *.exe
+
+relink: cleanexe $(TARGET).exe
+
+
+