}
foreach $file (sort keys %wxCommon) {
- next if $wxCommon{$file} =~ /\b16\b/;
+ next if $wxCommon{$file} =~ /\b(16|U)\b/;
$file =~ s/cp?p?$/obj/;
$project{"WXCOMMONOBJS"} .= "\$(COMMDIR)\\\$D\\" . $file . " "
}
#$}
-# 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 VC.T!
# File: makefile.vc
!if "$(WXMAKINGDLL)" == "1"
LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
-DUMMYOBJ=$D\dummydll.obj
!else
LIBTARGET=$(WXLIB)
-DUMMYOBJ=$D\dummy.obj
!endif
# This one overrides the others, to be consistent with the settings in setup.h
# 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
NONESSENTIALOBJS= #$ ExpandList("WXNONESSENTIALOBJS");
COMMONOBJS = \
- $(COMMDIR)\$D\y_tab.obj \
#$ ExpandList("WXCOMMONOBJS");
MSWOBJS = #$ ExpandList("WXMSWOBJS");
# Add $(HTMLOBJS) if wanting wxHTML classes
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
-ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
-SETUP_H=$(ARCHINCDIR)\wx\setup.h
+ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT)
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
# Normal, static library
all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
mkdir $(ARCHINCDIR)
mkdir $(ARCHINCDIR)\wx
-$(SETUP_H):
+$(WXDIR)\include\wx\msw\setup.h:
+ cd $(WXDIR)\include\wx\msw
+ if not exist setup.h copy setup0.h setup.h
+ cd $(WXDIR)\src\msw
+
+$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h
copy $(WXDIR)\include\wx\msw\setup.h $@
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx $(WXDIR)\$D
$D:
mkdir $D
$(REGEXDIR)\$D:
mkdir $(REGEXDIR)\$D
+$(WXDIR)\$D:
+ mkdir $(WXDIR)\$D
+
+
# wxWindows library as DLL
dll:
- nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
+ nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) MSLU=$(MSLU)
cleandll:
- nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
+ nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) MSLU=$(MSLU)
# wxWindows + app as DLL. Only affects main.cpp.
dllapp:
- nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
+ nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) MSLU=$(MSLU)
# wxWindows + app as DLL, for Netscape plugin - remove DllMain.
dllnp:
- nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
+ nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) MSLU=$(MSLU)
# Use this to make dummy.obj and generate a PCH.
# You might use the dll target, then the pch target, in order to
### Static library
-$(WXDIR)\lib\$(WXLIBNAME).lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
+$(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_LIBS)
-erase $(LIBTARGET)
$(implib) @<<
-out:$@
-machine:$(CPU)
-$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS)
+$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS)
<<
!else
$(link) @<<
$(LINKFLAGS) $(INCREMENTAL)
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
- $(DUMMYOBJ) $(OBJECTS) $(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
########################################################
# Windows-specific objects
-$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
- cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
-
-$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
- cl @<<
-$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
-<<
+$(DUMMYOBJ): $(DUMMY).$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
+ cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$(DUMMYOBJ) /c /Tp $(DUMMY).cpp
# Compile certain files with no optimization (some files cause a
# compiler crash for buggy versions of VC++, e.g. 4.0).
<<
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)
-erase *.pdb
-erase *.sbr
-erase $(WXLIBNAME).pch
+ -erase $(WXDIR)\$D\$(PCH)
+ -erase $(WXDIR)\$D\*.pdb
+ -erase $(WXDIR)\$D\*.obj
-erase $(GENDIR)\$D\*.obj
-erase $(GENDIR)\$D\*.pdb
-erase $(GENDIR)\$D\*.sbr
-rmdir $(HTMLDIR)\$(D)
-rmdir $(JPEGDIR)\$(D)
-rmdir $(TIFFDIR)\$(D)
+ -rmdir $(WXDIR)\$D
# Making documents
docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp
alldocs: docs
hlp: wxhlp
wxhlp: $(DOCDIR)/winhelp/wx.hlp
-refhlp: $(DOCDIR)/winhelp/techref.hlp
rtf: $(DOCDIR)/winhelp/wx.rtf
pdfrtf: $(DOCDIR)/pdf/wx.rtf
-refpdfrtf: $(DOCDIR)/pdf/techref.rtf
html: wxhtml
htb: $(DOCDIR)\htb\wx.htb
wxhtml: $(DOCDIR)\html\wx\wx.htm
htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
-ps: wxps referencps
+ps: wxps
wxps: $(WXDIR)\docs\ps\wx.ps
-referencps: $(WXDIR)\docs\ps\referenc.ps
allhlp: wxhlp
- cd $(WXDIR)\utils\dialoged\src
- nmake -f makefile.vc hlp
- cd $(WXDIR)\utils\tex2rtf\src
- nmake -f makefile.vc hlp
- cd $(THISDIR)
+
+# cd $(WXDIR)\utils\dialoged\src
+# nmake -f makefile.vc hlp
+# cd $(WXDIR)\utils\tex2rtf\src
+# nmake -f makefile.vc hlp
+# cd $(WXDIR)\contrib\src\fl
+# nmake -f makefile.vc hlp
+# cd $(THISDIR)
allhtml: wxhtml
- cd $(WXDIR)\utils\dialoged\src
- nmake -f makefile.vc html
- cd $(WXDIR)\utils\tex2rtf\src
- nmake -f makefile.vc html
- cd $(THISDIR)
+
+# cd $(WXDIR)\utils\dialoged\src
+# nmake -f makefile.vc html
+# cd $(WXDIR)\utils\tex2rtf\src
+# nmake -f makefile.vc html
+# cd $(WXDIR)\contrib\src\fl
+# cd $(THISDIR)
allhtmlhelp: htmlhelp
- cd $(WXDIR)\utils\dialoged\src
- nmake -f makefile.vc htmlhelp
- cd $(WXDIR)\utils\tex2rtf\src
- nmake -f makefile.vc htmlhelp
- cd $(THISDIR)
+
+# cd $(WXDIR)\utils\dialoged\src
+# nmake -f makefile.vc htmlhelp
+# cd $(WXDIR)\utils\tex2rtf\src
+# nmake -f makefile.vc htmlhelp
+# cd $(WXDIR)\contrib\src\fl
+# nmake -f makefile.vc htmlhelp
+# cd $(THISDIR)
allhtb: htb
- cd $(WXDIR)\utils\dialoged\src
- nmake -f makefile.vc htb
- cd $(WXDIR)\utils\tex2rtf\src
- nmake -f makefile.vc htb
- cd $(THISDIR)
+
+# cd $(WXDIR)\utils\dialoged\src
+# nmake -f makefile.vc htb
+# cd $(WXDIR)\utils\tex2rtf\src
+# nmake -f makefile.vc htb
+# cd $(WXDIR)\contrib\src\fl
+# nmake -f makefile.vc htb
+# cd $(THISDIR)
allps: wxps referencps
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc ps
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc ps
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc ps
cd $(THISDIR)
allpdfrtf: pdfrtf
- cd $(WXDIR)\utils\dialoged\src
- nmake -f makefile.vc pdfrtf
- cd $(WXDIR)\utils\tex2rtf\src
- nmake -f makefile.vc pdfrtf
- cd $(THISDIR)
+# cd $(WXDIR)\utils\dialoged\src
+# nmake -f makefile.vc pdfrtf
+# cd $(WXDIR)\utils\tex2rtf\src
+# nmake -f makefile.vc pdfrtf
+# cd $(WXDIR)\contrib\src\fl
+# nmake -f makefile.vc pdfrtf
+# cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
cd $(DOCDIR)/latex/wx
move wx.cnt $(DOCDIR)\winhelp\wx.cnt
cd $(THISDIR)
-$(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
- cd $(DOCDIR)/latex/techref
- -erase techref.ph
- hc techref
- move techref.hlp $(DOCDIR)\winhelp\techref.hlp
- move techref.cnt $(DOCDIR)\winhelp\techref.cnt
- cd $(THISDIR)
-
$(DOCDIR)/latex/wx/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
cd $(DOCDIR)\latex\wx
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
cd $(THISDIR)
-$(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
- cd $(DOCDIR)\latex\techref
- -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
- cd $(THISDIR)
-
$(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
cd $(DOCDIR)\latex\wx
-copy *.wmf $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
cd $(THISDIR)
-$(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
- cd $(DOCDIR)\latex\techref
- -copy *.wmf $(DOCDIR)\pdf
- -copy *.bmp $(DOCDIR)\pdf
- -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.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