}
foreach $file (sort keys %wxCommon) {
+ next if $wxCommon{$file} =~ /\b(16|U)\b/;
+
$isCFile = $file =~ /\.c$/;
$file =~ s/cp?p?$/obj/;
$obj = "\$(MSWDIR)\\" . $file . " ";
foreach $file (sort keys %wxMSW) {
next if $wxMSW{$file} =~ /\b16\b/;
- if ( $file =~ /^automtn/ ) {
- #! comment in old makefile.b32 seems to imply that this file can't
- #! be compiled with Borland (leads to crash in oleauto sample)
- next;
- }
+#! if ( $file =~ /^automtn/ ) {
+#! #! comment in old makefile.b32 seems to imply that this file can not
+#! #! be compiled with Borland (leads to crash in oleauto sample)
+#! No longer true, at least for BC++ 5.2
+#! next;
+#! }
$isCFile = $file =~ /\.c$/;
}
#$}
-# 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 B32.T!
#
# Makefile : Builds wxWindows library wx.lib for MS Windows,
# and Borland C++ (32-bit).
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+# BCCDIR now defined in ../makeb32.env
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
# Please set these according to the settings in wx_setup.h, so we can include
# the appropriate libraries in wx.lib
USE_CTL3D=0
-USE_XPM_IN_MSW=1
PERIPH_LIBS=
PERIPH_TARGET=
PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
!endif
-!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS)
-PERIPH_TARGET=xpm $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
-!endif
-
-#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS)
+#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
PERIPH_LIBS=
-PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET)
+PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
!if "$(DLL)" == "0"
DUMMY=dummy
!else
DUMMY=dummydll
-LIBS= cw32 import32 ole2w32
+LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
!endif
LIBTARGET=$(WXLIB)
# Not needed:
# $(MSWDIR)\colrdlgg.obj \
# $(MSWDIR)\fontdlgg.obj \
-# $(MSWDIR)\helpxlp.obj \
# $(MSWDIR)\msgdlgg.obj \
# $(MSWDIR)\printps.obj \
# $(MSWDIR)\prntdlgg.obj \
default: wx
-wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx: $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+all: wx
+
+# Copy the in-CVS setup0.h to setup.h if necessary
+makesetuph:
+ cd $(WXDIR)\include\wx\msw
+ if not exist setup.h copy setup0.h setup.h
+ cd $(WXDIR)\src\msw
-all: all_libs all_execs
+# Copy include\wx\msw\setup.h to the architecture-specific location
+makearchsetuph:
+ copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH)
+ cd $(WXDIR)\src\msw
+
+$(ARCHINCDIR)\wx:
+ -mkdir $(ARCHINCDIR)
+ -mkdir $(ARCHINCDIR)\wx
!if "$(DLL)" == "0"
$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET)
- tlib $(LIBTARGET) /P1024 @&&!
+ tlib "$(LIBTARGET)" /P1024 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
!
$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET)
-erase $(WXLIBDIR)\wx.dll
- tlink32 $(LINK_FLAGS) /v @&&!
+ $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
c0d32.obj $(OBJECTS)
$(WXLIBDIR)\wx
nul
wxb32
!
implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
-
!endif
dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
-dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res
+
+version.res:
+ brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
all_utils:
cd $(WXDIR)\utils
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
all_samples:
cd $(WXDIR)\samples
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
all_execs:
cd $(WXDIR)\utils
- make -f makefile.b32 all_execs
+ ${MAKE} -f makefile.b32 all_execs
cd $(WXDIR)\src\msw
-wxxpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
- cd $(WXDIR)\src\msw
-
-clean_wxxpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 clean
- cd $(WXDIR)\src\msw
-
png: $(CFG)
cd $(WXDIR)\src\png
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
clean_png:
cd $(WXDIR)\src\png
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
zlib: $(CFG)
cd $(WXDIR)\src\zlib
- make -f makefile.b32 lib
+ ${MAKE} -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_zlib:
cd $(WXDIR)\src\zlib
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
jpeg: $(CFG)
cd $(WXDIR)\src\jpeg
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
clean_jpeg:
cd $(WXDIR)\src\jpeg
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
-xpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 lib
+regex: $(CFG)
+ cd $(WXDIR)\src\regex
+ ${MAKE} -f makefile.b32 lib
cd $(WXDIR)\src\msw
-clean_xpm:
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 clean
+clean_regex:
+ cd $(WXDIR)\src\regex
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
tiff: $(CFG)
cd $(WXDIR)\src\tiff
- make -f makefile.b32 lib
+ ${MAKE} -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_tiff:
cd $(WXDIR)\src\tiff
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
$(CFG): makefile.b32
copy &&!
+-Hc
-H=$(WXDIR)\src\msw\wx32.csm
-3
-d
-w-par
-w-aus
-w-hid # virtual function A hides virtual function B
--WE
-tWM
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
+-I$(ARCHINCDIR);$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32
--L$(BCCDIR)\lib
+-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
-D__WXWIN__
-D__WXMSW__
-D__WINDOWS__
$(WIN95FLAG)
! $(CFG)
-#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
-# -Oxt
-
clean: $(PERIPH_CLEAN_TARGET)
-erase $(LIBTARGET)
+ -erase $(WXLIBDIR)\wx.dll
+ -erase $(WXLIBDIR)\wx.tds
+ -erase $(WXLIBDIR)\wx.il?
-erase *.obj
-erase *.pch
-erase *.csm
allhlp: wxhlp portinghlp prophlp
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 hlp
+ ${MAKE} -f makefile.b32 hlp
cd $(THISDIR)
# cd $(WXDIR)\utils\wxhelp\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\tex2rtf\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxgraph\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxchart\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxtree\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxbuild\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxgrid\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
allhtml: wxhtml portinghtml prophtml
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 html
+ ${MAKE} -f makefile.b32 html
cd $(THISDIR)
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\dialoged\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\hytext\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxhelp\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\tex2rtf\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxgraph\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxchart\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxtree\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
allps: wxps referencps portingps propps
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 ps
+ ${MAKE} -f makefile.b32 ps
cd $(THISDIR)
allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 pdfrtf
+ ${MAKE} -f makefile.b32 pdfrtf
cd $(THISDIR)
# cd $(WXDIR)\utils\wxhelp\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\tex2rtf\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\wxgraph\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\wxchart\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\wxtree\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
projects / wxWidgets.git / blobdiff