only set focus on textctrl item if it exists (exists if combo box is editable)

[wxWidgets.git] / src / makeprog.b32

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 429de99256a08cb107774aa1bc095d96036a5c33..880ac4a44bd6bbb57849e7f0eec41ab4b3e965ed 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -8,29 +8,39 @@
 # 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
 

-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg odbc32
+!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 "$(FINAL)" == "0"
 
 !if "$(FINAL)" == "0"

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

 OPT = -Od
 DEBUG_FLAGS= -v
 !else
 OPT = -Od
 DEBUG_FLAGS= -v
 !else

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

 OPT = -Od
 DEBUG_FLAGS =
 !endif
 
 OPT = -Od
 DEBUG_FLAGS =
 !endif
 

-CPPFLAGS=$(DEBUG_FLAGS) $(EXTRACPPFLAGS) $(OPT) @$(CFG)
+CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT)

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

-  tlink32 $(LINKFLAGS) @&&!
+  $(LINK) $(LINKFLAGS) @&&!

 c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 c0w32.obj $(OBJECTS)
 $(TARGET)
 nul


@@ -46,7 +56,7 @@ $(TARGET).res
        bcc32 $(CPPFLAGS) -P- -c {$< }
 
 $(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
        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
 
 clean:
         -erase *.obj


@@ -54,4 +64,6 @@ clean:
         -erase *.res
         -erase *.map
         -erase *.rws
         -erase *.res
         -erase *.map
         -erase *.rws

+        -erase *.tds
+        -erase *.il?