Now scaling doesn't scale GetTextExtent() anymore. This

[wxWidgets.git] / src / makeprog.b32

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index b1769c160283bd1c6c9f36d57a1119ea9daaf5dc..2afd2304d60db2162f1f1737157101cea7a59430 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -8,44 +8,65 @@
 # Include file for samples and utilities. Set TARGET and OBJECTS
 # before including this file.
 
 # Include file for samples and utilities. Set TARGET and OBJECTS
 # before including this file.
 

-# WXWIN and BCCDIR are set by parent make
+# WXWIN  set by parent make
+# BCCDIR set in makeb32.env

 
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
 
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 

+!if "$(wxUSE_GUI)" == "0"
+IMGLIBS=
+!else
+IMGLIBS= winpng jpeg tiff
+!endif
+

 !if "$(WXUSINGDLL)" == "1"
 !if "$(WXUSINGDLL)" == "1"

-LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg tiff odbc32
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex zlib $(IMGLIBS) odbc32

 !else
 !else

-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg tiff odbc32
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex zlib $(IMGLIBS) odbc32

 !endif
 
 # Note: you may need to remove some libraries for earlier versions of BC++, as below
 #LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib tiff
 
 !endif
 
 # Note: you may need to remove some libraries for earlier versions of BC++, as below
 #LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib tiff
 

+!if "$(wxUSE_GUI)" == "0"
+LINKOUT = /ap
+!else
+LINKOUT = /aa
+!endif
+

 !if "$(FINAL)" == "0"
 #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)
 !if "$(FINAL)" == "0"
 #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)

-LINKFLAGS=/v /c /aa -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
+LINKFLAGS=/v /c $(LINKOUT) -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)

 OPT = -Od
 DEBUG_FLAGS= -v
 !else
 #LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS= -v
 !else
 #LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)

-LINKFLAGS=/aa -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
+LINKFLAGS=$(LINKOUT) -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)

 OPT = -Od
 DEBUG_FLAGS =
 !endif
 
 CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT)
 
 OPT = -Od
 DEBUG_FLAGS =
 !endif
 
 CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT)
 

+!if "$(wxUSE_GUI)" == "0"
+TARGETRES = 
+STARTUP = c0x32.obj    
+!else
+TARGETRES = $(TARGET).res
+STARTUP = c0w32.obj
+!endif
+

 all: $(TARGET).exe $(EXTRATARGETS)
 
 all: $(TARGET).exe $(EXTRATARGETS)
 

-$(TARGET).exe: $(OBJECTS) $(TARGET).res
+$(TARGET).exe: $(OBJECTS) $(TARGETRES)

   $(LINK) $(LINKFLAGS) @&&!
   $(LINK) $(LINKFLAGS) @&&!

-c0w32.obj $(OBJECTS)
+$(STARTUP) $(OBJECTS)

 $(TARGET)
 nul
 $(LIBS)
 
 $(TARGET)
 nul
 $(LIBS)
 

-$(TARGET).res
+$(TARGETRES)

 !
 
 .$(SRCSUFF).obj:
 !
 
 .$(SRCSUFF).obj: