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

[wxWidgets.git] / src / makeprog.wat

diff --git a/src/makeprog.wat b/src/makeprog.wat
index 99b984842e7532306d9b14ed152021f8ae4ac471..d2f8809d8619c67c8b6fcb3d4d4938dc1e754b2d 100644 (file)
--- a/src/makeprog.wat
+++ b/src/makeprog.wat
@@ -1,39 +1,66 @@
+#
+# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
+#
+# $+ .. $- means we get the result directly
+THISDIR = $+ $(%cdrive):$(%cwd) $-
+
 WXDIR = $(%WXWIN)
+!ifndef EXEDIR
+OUTPUTDIR = $(THISDIR)\Watcom 
+!else
+OUTPUTDIR = $(THISDIR)\$(EXEDIR)
+!ifeq EXEDIR "."
+OUTPUTDIR = $(THISDIR)
+!endif
+!endif
 
 !include $(WXDIR)\src\makewat.env
 
 WXLIB = $(WXDIR)\lib
-LNK = $(PROGRAM).lnk
+LNK = $(OUTPUTDIR)\$(PROGRAM).lnk
+
+all: MAKEDIR $(OUTPUTDIR)\$(PROGRAM).exe $(EXTRATARGETS) .SYMBOLIC
+
+MAKEDIR: .SYMBOLIC
+       @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
 
-all: $(PROGRAM).exe $(EXTRATARGETS)
+!ifeq wxUSE_GUI 0
+RESFILE=
+!else
+RESFILE=$(OUTPUTDIR)\$(PROGRAM).res
+!endif
 
-$(PROGRAM).exe : $(OBJECTS) $(PROGRAM).res $(LNK) $(WXLIB)\wx.lib
+$(OUTPUTDIR)\$(PROGRAM).exe : $(OBJECTS) $(RESFILE) $(LNK) $(WXLIB)\$(LIBNAME).lib
     wlink @$(LNK)
-    $(BINDCOMMAND) $(PROGRAM).res
+!ifneq wxUSE_GUI 0
+    $(BINDCOMMAND) $(RESFILE)
+!endif
 
-$(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(PROGRAM).rc
+!ifneq wxUSE_GUI 0
+$(RESFILE): $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
+     $(RC) $(RESFLAGS) /fo=$(RESFILE) $(PROGRAM).rc
+!endif
 
-$(LNK) : makefile.wat
+$(LNK) : .SYMBOLIC
     %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
+    @%append $(LNK) $(LDFLAGS)
+    @%append $(LNK) $(DEBUGINFO)
+    @%append $(LNK) system $(LINKSYSTEM)
     @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(PROGRAM).exe
+    @%append $(LNK) name $(OUTPUTDIR)\$(PROGRAM).exe
     @for %i in ($(OBJECTS)) do @%append $(LNK) file %i
     @for %i in ($(LIBS)) do @%append $(LNK) lib %i
     @for %i in ($(EXTRALIBS)) do @%append $(LNK) lib %i
-#    @%append $(LNK) $(MINDATA)
-#    @%append $(LNK) $(MAXDATA)
 
 clean:   .SYMBOLIC
-    -erase *.obj
-    -erase *.bak
-    -erase *.err
-    -erase *.pch
-    -erase *.lib
+    -erase $(OUTPUTDIR)\*.obj
+    -erase $(OUTPUTDIR)\*.bak
+    -erase $(OUTPUTDIR)\*.err
+    -erase $(OUTPUTDIR)\*.pch
+    -erase $(OUTPUTDIR)\*.lib
     -erase $(LNK)
-    -erase *.res
-    -erase *.exe
-    -erase *.lbc
+    -erase $(OUTPUTDIR)\*.res
+    -erase $(OUTPUTDIR)\*.exe
+    -erase $(OUTPUTDIR)\*.lbc
+       -rmdir $(OUTPUTDIR)