# Set to 0 if not using GLCanvas (only affects DLL build)
USE_GLCANVAS=1
-# Set to 0 if you are using MSVC 5
+# Set to 1 if you are using MSVC 5
USE_MSVC_5=0
# These are absolute paths, so that the compiler
$(GENDIR)\$D\numdlgg.obj \
$(GENDIR)\$D\panelg.obj \
$(GENDIR)\$D\progdlgg.obj \
- $(GENDIR)\$D\prop.obj \
- $(GENDIR)\$D\propform.obj \
- $(GENDIR)\$D\proplist.obj \
$(GENDIR)\$D\sashwin.obj \
$(GENDIR)\$D\scrlwing.obj \
$(GENDIR)\$D\spinctlg.obj \
$(GENDIR)\$D\tipdlg.obj \
$(GENDIR)\$D\tipwin.obj \
$(GENDIR)\$D\treectlg.obj \
- $(GENDIR)\$D\treelay.obj \
$(GENDIR)\$D\wizard.obj
# These are generic things that don't need to be compiled on MSW,
# but sometimes it's useful to do so for testing purposes.
NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
$(GENDIR)\$D\dirdlgg.obj \
+ $(GENDIR)\$D\filedlgg.obj \
$(GENDIR)\$D\fontdlgg.obj \
$(GENDIR)\$D\helpext.obj \
- $(GENDIR)\$D\helphtml.obj \
$(GENDIR)\$D\imaglist.obj \
$(GENDIR)\$D\listctrl.obj \
$(GENDIR)\$D\mdig.obj \
$(GENDIR)\$D\tabg.obj
COMMONOBJS = \
- $(COMMDIR)\$D\y_tab.obj \
+ $(COMMDIR)\$D\accesscmn.obj \
$(COMMDIR)\$D\appcmn.obj \
$(COMMDIR)\$D\artprov.obj \
$(COMMDIR)\$D\artstd.obj \
$(COMMDIR)\$D\cshelp.obj \
$(COMMDIR)\$D\ctrlcmn.obj \
$(COMMDIR)\$D\ctrlsub.obj \
+ $(COMMDIR)\$D\datacmn.obj \
$(COMMDIR)\$D\datetime.obj \
$(COMMDIR)\$D\datstrm.obj \
$(COMMDIR)\$D\db.obj \
$(COMMDIR)\$D\dobjcmn.obj \
$(COMMDIR)\$D\docmdi.obj \
$(COMMDIR)\$D\docview.obj \
+ $(COMMDIR)\$D\dpycmn.obj \
$(COMMDIR)\$D\dseldlg.obj \
$(COMMDIR)\$D\dynarray.obj \
$(COMMDIR)\$D\dynlib.obj \
$(COMMDIR)\$D\mstream.obj \
$(COMMDIR)\$D\nbkbase.obj \
$(COMMDIR)\$D\object.obj \
- $(COMMDIR)\$D\odbc.obj \
$(COMMDIR)\$D\paper.obj \
$(COMMDIR)\$D\popupcmn.obj \
$(COMMDIR)\$D\prntbase.obj \
$(COMMDIR)\$D\quantize.obj \
$(COMMDIR)\$D\radiocmn.obj \
$(COMMDIR)\$D\regex.obj \
- $(COMMDIR)\$D\resource.obj \
+ $(COMMDIR)\$D\rgncmn.obj \
$(COMMDIR)\$D\sckaddr.obj \
$(COMMDIR)\$D\sckfile.obj \
$(COMMDIR)\$D\sckipc.obj \
$(COMMDIR)\$D\stream.obj \
$(COMMDIR)\$D\string.obj \
$(COMMDIR)\$D\sysopt.obj \
+ $(COMMDIR)\$D\taskbarcmn.obj \
$(COMMDIR)\$D\tbarbase.obj \
$(COMMDIR)\$D\textbuf.obj \
$(COMMDIR)\$D\textcmn.obj \
$(COMMDIR)\$D\wfstream.obj \
$(COMMDIR)\$D\wincmn.obj \
$(COMMDIR)\$D\wxchar.obj \
- $(COMMDIR)\$D\wxexpr.obj \
$(COMMDIR)\$D\xpmdecod.obj \
$(COMMDIR)\$D\zipstrm.obj \
$(COMMDIR)\$D\zstream.obj
MSWOBJS = $(MSWDIR)\$D\accel.obj \
+ $(OLEDIR)\$D\access.obj \
$(MSWDIR)\$D\app.obj \
$(OLEDIR)\$D\automtn.obj \
$(MSWDIR)\$D\bitmap.obj \
$(MSWDIR)\$D\colour.obj \
$(MSWDIR)\$D\combobox.obj \
$(MSWDIR)\$D\control.obj \
- $(MSWDIR)\$D\curico.obj \
$(MSWDIR)\$D\cursor.obj \
$(MSWDIR)\$D\data.obj \
$(OLEDIR)\$D\dataobj.obj \
$(MSWDIR)\$D\dialog.obj \
$(MSWDIR)\$D\dialup.obj \
$(MSWDIR)\$D\dib.obj \
- $(MSWDIR)\$D\dibutils.obj \
$(MSWDIR)\$D\dir.obj \
$(MSWDIR)\$D\dirdlg.obj \
+ $(MSWDIR)\$D\display.obj \
$(MSWDIR)\$D\dragimag.obj \
$(OLEDIR)\$D\dropsrc.obj \
$(OLEDIR)\$D\droptgt.obj \
$(MSWDIR)\$D\utils.obj \
$(MSWDIR)\$D\utilsexc.obj \
$(OLEDIR)\$D\uuid.obj \
+ $(MSWDIR)\$D\uxtheme.obj \
$(MSWDIR)\$D\volume.obj \
$(MSWDIR)\$D\wave.obj \
$(MSWDIR)\$D\window.obj
$(HTMLDIR)\$D\m_layout.obj \
$(HTMLDIR)\$D\m_links.obj \
$(HTMLDIR)\$D\m_list.obj \
- $(HTMLDIR)\$D\m_meta.obj \
$(HTMLDIR)\$D\m_pre.obj \
$(HTMLDIR)\$D\m_style.obj \
$(HTMLDIR)\$D\m_tables.obj \
# Add $(HTMLOBJS) if wanting wxHTML classes
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
-ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
+ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT)
SETUP_H=$(ARCHINCDIR)\wx\setup.h
# Normal, static library
$(link) @<<
$(LINKFLAGS) $(INCREMENTAL)
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
- $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
+ $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
<<
!endif
<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\hash.obj /c /Tp $(COMMDIR)\hash.cpp
-<<
- cl @<<
-$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp
<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp
<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp
-<<
- cl @<<
-$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp
<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp
png:
cd $(WXDIR)\src\png
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0
cd $(WXDIR)\src\msw
clean_png:
zlib:
cd $(WXDIR)\src\zlib
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0
cd $(WXDIR)\src\msw
clean_zlib:
jpeg:
cd $(WXDIR)\src\jpeg
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all
cd $(WXDIR)\src\msw
clean_jpeg:
tiff:
cd $(WXDIR)\src\tiff
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all
cd $(WXDIR)\src\msw
clean_tiff:
regex:
cd $(WXDIR)\src\regex
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all
cd $(WXDIR)\src\msw
clean_regex:
cd $(WXDIR)\src\msw
cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex
- -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
- -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
- -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
- -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb
- -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk
+ -erase ..\..\lib\$(WXLIBNAME).dll
+ -erase ..\..\lib\$(WXLIBNAME).lib
+ -erase ..\..\lib\$(WXLIBNAME).exp
+ -erase ..\..\lib\$(WXLIBNAME).pdb
+ -erase ..\..\lib\$(WXLIBNAME).ilk
clean: $(PERIPH_CLEAN_TARGET)
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
cd $(THISDIR)
+# This target does two sets of HTML: one using a style sheet, for
+# the purposes of the CHM file, and one without.
$(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
cd $(DOCDIR)\latex\wx
-mkdir $(DOCDIR)\html\wx
copy *.gif $(DOCDIR)\html\wx
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
+ -mkdir $(DOCDIR)\mshtml
+ -mkdir $(DOCDIR)\mshtml\wx
+ copy *.gif $(DOCDIR)\mshtml\wx
+ -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\mshtml\wx\wx.htm -twice -html -macros $(DOCDIR)\latex\wx\tex2rtf_css.ini
-erase $(DOCDIR)\html\wx\*.con
-erase $(DOCDIR)\html\wx\*.ref
-erase $(DOCDIR)\latex\wx\*.con
-erase $(DOCDIR)\latex\wx\*.ref
cd $(THISDIR)
-$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
- cd $(DOCDIR)\html\wx
+$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp
+ cd $(DOCDIR)\mshtml\wx
+ copy $(DOCDIR)\latex\wx\wx.css .
-hhc wx.hhp
-mkdir ..\..\htmlhelp
-erase $(DOCDIR)\htmlhelp\wx.chm
projects / wxWidgets.git / blobdiff