Fixed overlapping buttons in wizard on MacOS X

[wxWidgets.git] / src / makeprog.b32

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 5f879ff864a3dd08e9ff6d4a5b94db854851d23d..67c9a6854dc3bd6825c9616500f1b2931cefce43 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -8,35 +8,59 @@
 # 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
 
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg
+!if "$(WXUSINGDLL)" == "1"
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng regex zlib jpeg tiff odbc32
+!else
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng regex zlib jpeg tiff 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
+
+!if "$(wxUSE_GUI)" == "0"
+LINKOUT = /ap
+!else
+LINKOUT = /aa
+!endif
 
 !if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)
+#LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)
+LINKFLAGS=/v /c $(LINKOUT) -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS= -v
 !else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)
+#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
+LINKFLAGS=$(LINKOUT) -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS =
 !endif
 
-CPPFLAGS=$(DEBUG_FLAGS) $(EXTRACPPFLAGS) $(OPT) @$(CFG)
+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)
 
-$(TARGET).exe: $(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
+$(TARGET).exe: $(OBJECTS) $(TARGETRES)
+  $(LINK) $(LINKFLAGS) @&&!
+$(STARTUP) $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
 
-$(TARGET).res
+$(TARGETRES)
 !
 
 .$(SRCSUFF).obj:
@@ -46,7 +70,7 @@ $(TARGET).res
        bcc32 $(CPPFLAGS) -P- -c {$< }
 
 $(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(TARGET)
 
 clean:
         -erase *.obj
@@ -54,4 +78,6 @@ clean:
         -erase *.res
         -erase *.map
         -erase *.rws
+        -erase *.tds
+        -erase *.il?