wxNotebook fixes for Win16; VC++ 4 fixes for OLE files; wxGA_SMOOTH flag (wxMSW);

wxFRAME_FLOAT_ON_PARENT style for frames (wxMSW) to get traditional MSW behaviour.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-05-05 08:57:41 +00:00
parent e716ca3d3b
commit aeab10d07c
11 changed files with 129 additions and 50 deletions

View File

@@ -1,5 +1,5 @@
#
# File: makefile.nt
# File: makefile.vc
# Author: Julian Smart
# Created: 1993
# Updated:
@@ -23,74 +23,70 @@ LINK_DEBUG_FLAGS="/RELEASE"
all:
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
cd $(WXDIR)\utils\wxprop\src
nmake -f makefile.nt test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\hytext\src
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\mfutils\src
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\tex2rtf\src
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\wxbuild\src
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\wxgraph\src
# nmake -f makefile.nt test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\wxtree\src
# nmake -f makefile.nt test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\wxhelp\src
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\wximage\win
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\wxweb\src
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\wxhelp2\src
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\clockwrk\src
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\wxanim\src
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\colours
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\ogl\src
# nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# cd $(WXDIR)\utils\wxchart\src
# nmake -f makefile.nt test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
# nmake -f makefile.vc test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
clean:
cd $(WXDIR)\utils\wxprop\src
nmake -f makefile.nt clean
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.nt clean
nmake -f makefile.vc clean
cd $(WXDIR)\utils\nplugin
nmake -f makefile.nt clean
nmake -f makefile.vc clean
# cd $(WXDIR)\utils\hytext\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\mfutils\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\tex2rtf\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\wxbuild\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\wxgraph\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\wxtree\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\wxhelp\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\wxhelp2\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\clockwrk\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\wxanim\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\colours
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\ogl\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\wxchart\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\wxweb\src
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean
# cd $(WXDIR)\utils\wximage\win
# nmake -f makefile.nt clean
# nmake -f makefile.vc clean