projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Cygwin and MinGW compilation
[wxWidgets.git]
/
distrib
/
msw
/
tmake
/
bcc.t
diff --git
a/distrib/msw/tmake/bcc.t
b/distrib/msw/tmake/bcc.t
index e4683f6ecad254e39753a3a39d2cffe35334e09f..d9ccb8f43e34f4fb2334ec31153ba657815bb8c3 100644
(file)
--- a/
distrib/msw/tmake/bcc.t
+++ b/
distrib/msw/tmake/bcc.t
@@
-31,7
+31,7
@@
foreach $file (sort keys %wxCommon) {
#! socket files don't compile under Win16 currently
foreach $file (sort keys %wxCommon) {
#! socket files don't compile under Win16 currently
- next if $wxCommon{$file} =~ /\b(32|S)\b/;
+ next if $wxCommon{$file} =~ /\b(32|S
|U
)\b/;
#! needs extra files (sql*.h) so not compiled by default.
next if $file =~ /^odbc\./;
#! needs extra files (sql*.h) so not compiled by default.
next if $file =~ /^odbc\./;
@@
-58,7
+58,7
@@
}
#$}
}
#$}
-# This file was automatically generated by tmake
at #$ Now()
+# This file was automatically generated by tmake
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
#
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
#
@@
-98,7
+98,6
@@
THISDIR = $(WXDIR)\src\msw
# Please set these according to the settings in wx_setup.h, so we can include
# the appropriate libraries in wx.lib
USE_CTL3D=1
# Please set these according to the settings in wx_setup.h, so we can include
# the appropriate libraries in wx.lib
USE_CTL3D=1
-USE_XPM_IN_MSW=1
PERIPH_LIBS=
PERIPH_TARGET=
PERIPH_LIBS=
PERIPH_TARGET=
@@
-108,12
+107,6
@@
PERIPH_CLEAN_TARGET=
PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
!endif
PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
!endif
-!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
-PERIPH_TARGET=xpm $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
-!endif
-
# TODO: add these libraries
# PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
PERIPH_TARGET=zlib png $(PERIPH_TARGET)
# TODO: add these libraries
# PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
PERIPH_TARGET=zlib png $(PERIPH_TARGET)
@@
-228,16
+221,6
@@
all_execs:
cd $(WXDIR)\src\msw
# CONTRIB
cd $(WXDIR)\src\msw
# CONTRIB
-xpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
- cd $(WXDIR)\src\msw
-
-clean_xpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.bcc clean
- cd $(WXDIR)\src\msw
-
png: $(CFG)
cd $(WXDIR)\src\png
make -f makefile.bcc
png: $(CFG)
cd $(WXDIR)\src\png
make -f makefile.bcc
@@
-275,7
+258,7
@@
$(CFG): makefile.bcc
-Fs-
-Vf
-Ff=4
-Fs-
-Vf
-Ff=4
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib
;$(WXDIR)/src/xpm
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib
-D__WXWIN__
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib
-D__WXWIN__