diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 0c7f4f0050..24962ffcf0 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -209,6 +209,8 @@ samples/wxsocket/*.def samples/wxsocket/makefile* samples/wxsocket/client.wat samples/wxsocket/server.wat +samples/wxsocket/client.vc +samples/wxsocket/server.vc samples/wxsocket/*.xbm samples/wxsocket/*.xpm samples/wxsocket/*.ico diff --git a/distrib/msw/gtk.rsp b/distrib/msw/gtk.rsp index 995c328ac3..2ada26047e 100644 --- a/distrib/msw/gtk.rsp +++ b/distrib/msw/gtk.rsp @@ -16,6 +16,9 @@ include/install-sh src/Makefile src/Makefile.in src/*.inc +src/make.env +src/makelib.env +src/makeprog.env src/gtk/*.cpp src/gtk/*.c diff --git a/distrib/msw/motif.rsp b/distrib/msw/motif.rsp index 9694bc765d..61529911ee 100644 --- a/distrib/msw/motif.rsp +++ b/distrib/msw/motif.rsp @@ -9,6 +9,10 @@ mkinstalldirs wxinstall src/makeenvs/*.env +src/makeprog.env +src/make.env +src/makelib.env +src/makeprog.env src/Makefile src/Makefile.in @@ -90,9 +94,6 @@ src/motif/mdi/lib/Imakefile src/motif/mdi/test/*.C src/motif/mdi/test/Imakefile -src/make.env -src/makeprog.env - include/wx/motif/*.h include/install-sh diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp index 05f261da53..e1812148a0 100644 --- a/distrib/msw/msw.rsp +++ b/distrib/msw/msw.rsp @@ -10,21 +10,23 @@ tools/gettext/msgunfmt.exe src/makeb32.env src/makebcc.env -src/makemsw.env -src/makeprog.msw +src/makemsc.env +src/makeprog.msc src/makewat.env src/makeprog.wat src/makesc.env +src/makevc.env src/makeg95.env src/makesl.env src/makeprog.sl src/salford.lnk -src/ntwxwin.mak src/maketwin.env src/makeprog.twn +src/makeprog.vc +src/makelib.vc src/makefile.bcc src/makefile.dos -src/makefile.nt +src/makefile.vc src/*.bat src/common/dosyacc.c diff --git a/distrib/msw/stubs.rsp b/distrib/msw/stubs.rsp index 93cf490500..df64c1f58d 100644 --- a/distrib/msw/stubs.rsp +++ b/distrib/msw/stubs.rsp @@ -5,6 +5,7 @@ src/stubs/*.inc src/make.env src/makeprog.env +src/makelib.env include/wx/stubs/*.h include/wx/stubs/*.rc diff --git a/docs/msw/install.txt b/docs/msw/install.txt index bce03f2bcd..3bc2f1e297 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -48,9 +48,9 @@ Using project files: Using makefiles: 1. Make sure your WXWIN variable is set. -2. Change directory to wx\src\msw. Type 'nmake -f makefile.nt' to +2. Change directory to wx\src\msw. Type 'nmake -f makefile.vc' to make the wxWindows core library. -3. Change directory to wx\samples and type 'nmake -f makefile.nt' +3. Change directory to wx\samples and type 'nmake -f makefile.vc' to make all the samples. You can also make them individually. Note (1): if you wish to use templates, please edit diff --git a/samples/bombs/makefile.nt b/samples/bombs/makefile.nt deleted file mode 100644 index 85b78daad2..0000000000 --- a/samples/bombs/makefile.nt +++ /dev/null @@ -1,74 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds bombs example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\bombs -PROGRAM=bombs - -OBJECTS = $(PROGRAM).obj bombs1.obj game.obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -bombs1.obj: bombs1.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -game.obj: game.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/bombs/makefile.vc b/samples/bombs/makefile.vc new file mode 100644 index 0000000000..06a647f524 --- /dev/null +++ b/samples/bombs/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=bombs +OBJECTS = $(PROGRAM).obj bombs1.obj game.obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/checklst/makefile.nt b/samples/checklst/makefile.nt deleted file mode 100644 index 44c4478783..0000000000 --- a/samples/checklst/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds checklst example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\checklst -PROGRAM=checklst - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/checklst/makefile.vc b/samples/checklst/makefile.vc new file mode 100644 index 0000000000..63fb5dce8d --- /dev/null +++ b/samples/checklst/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=checklst +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/config/makefile.nt b/samples/config/makefile.nt deleted file mode 100644 index 3d516b5d9e..0000000000 --- a/samples/config/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds conftest example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\conftest -PROGRAM=conftest - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc new file mode 100644 index 0000000000..de60e4e620 --- /dev/null +++ b/samples/config/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=conftest +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/controls/makefile.nt b/samples/controls/makefile.nt deleted file mode 100644 index 3c3fb68cff..0000000000 --- a/samples/controls/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds controls example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\controls -PROGRAM=controls - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/controls/makefile.vc b/samples/controls/makefile.vc new file mode 100644 index 0000000000..c64996a7a4 --- /dev/null +++ b/samples/controls/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=controls +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/db/makefile.nt b/samples/db/makefile.nt deleted file mode 100644 index 1888b9caf0..0000000000 --- a/samples/db/makefile.nt +++ /dev/null @@ -1,69 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds db example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\db -PROGRAM=dbtest - -OBJECTS = $(PROGRAM).obj listdb.obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -listdb.obj: listdb.cpp $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/db/makefile.vc b/samples/db/makefile.vc new file mode 100644 index 0000000000..e1243b6d30 --- /dev/null +++ b/samples/db/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=dbtest +OBJECTS = $(PROGRAM).obj listdb.obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/dialogs/makefile.nt b/samples/dialogs/makefile.nt deleted file mode 100644 index cec864579d..0000000000 --- a/samples/dialogs/makefile.nt +++ /dev/null @@ -1,63 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds dialogs example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\dialogs -PROGRAM=dialogs - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) dialogs.h $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb - diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc new file mode 100644 index 0000000000..ee79a94674 --- /dev/null +++ b/samples/dialogs/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=dialogs +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp index 9de516c481..abc81422ca 100644 --- a/samples/dnd/dnd.cpp +++ b/samples/dnd/dnd.cpp @@ -308,8 +308,10 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) ) if ( !m_strText.IsEmpty() ) { // start drag operation + wxTextDataObject textData(m_strText); + wxDropSource dragSource( textData, this ); - wxDropSource dragSource( new wxTextDataObject (m_strText), this ); +// wxDropSource dragSource( new wxTextDataObject (m_strText), this ); const char *pc; switch ( dragSource.DoDragDrop(TRUE) ) diff --git a/samples/dnd/makefile.nt b/samples/dnd/makefile.nt deleted file mode 100644 index b7c81a7092..0000000000 --- a/samples/dnd/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds dnd example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\dnd -PROGRAM=dnd - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc new file mode 100644 index 0000000000..bd49ea4d97 --- /dev/null +++ b/samples/dnd/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=dnd +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/docview/makefile.nt b/samples/docview/makefile.nt deleted file mode 100644 index d17489dd3a..0000000000 --- a/samples/docview/makefile.nt +++ /dev/null @@ -1,75 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds docview example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\docview -PROGRAM=docview - -OBJECTS = $(PROGRAM).obj doc.obj view.obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - -$(PROGRAM).obj: $(PROGRAM).h doc.h view.h $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -doc.obj: doc.h doc.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -view.obj: view.h view.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb - -erase *.sbr - - diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc new file mode 100644 index 0000000000..9b20d64402 --- /dev/null +++ b/samples/docview/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=docview +OBJECTS = $(PROGRAM).obj doc.obj view.obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/docvwmdi/makefile.nt b/samples/docvwmdi/makefile.nt deleted file mode 100644 index 850f1ea471..0000000000 --- a/samples/docvwmdi/makefile.nt +++ /dev/null @@ -1,75 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds docview example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\docvwmdi -PROGRAM=docview - -OBJECTS = $(PROGRAM).obj doc.obj view.obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - -$(PROGRAM).obj: $(PROGRAM).h doc.h view.h $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -doc.obj: doc.h doc.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -view.obj: view.h view.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb - -erase *.sbr - - diff --git a/samples/docvwmdi/makefile.vc b/samples/docvwmdi/makefile.vc new file mode 100644 index 0000000000..9b20d64402 --- /dev/null +++ b/samples/docvwmdi/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=docview +OBJECTS = $(PROGRAM).obj doc.obj view.obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/dynamic/makefile.nt b/samples/dynamic/makefile.nt deleted file mode 100644 index 76464c3e90..0000000000 --- a/samples/dynamic/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds dynamic example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\dynamic -PROGRAM=dynamic - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/dynamic/makefile.vc b/samples/dynamic/makefile.vc new file mode 100644 index 0000000000..8b9485251a --- /dev/null +++ b/samples/dynamic/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=dynamic +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/forty/makefile.nt b/samples/forty/makefile.nt deleted file mode 100644 index 0a70e53963..0000000000 --- a/samples/forty/makefile.nt +++ /dev/null @@ -1,98 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1997 -# Updated: -# Copyright: -# -# "%W% %G%" -# -# Makefile : Builds Forty Thieves example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\forty -PROGRAM=forty - -OBJECTS = $(PROGRAM).obj canvas.obj card.obj game.obj pile.obj playerdg.obj scoredg.obj scorefil.obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).h $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -canvas.obj: forty.h canvas.h canvas.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -card.obj: forty.h card.h card.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -pile.obj: forty.h pile.h pile.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -game.obj: forty.h game.h game.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -playerdg.obj: forty.h playerdg.h playerdg.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -scoredg.obj: forty.h scoredg.h scoredg.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -scorefil.obj: forty.h scorefil.h scorefil.$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include /i$(WXDIR)\contrib\fafa -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb - diff --git a/samples/forty/makefile.vc b/samples/forty/makefile.vc new file mode 100644 index 0000000000..7c809b7e74 --- /dev/null +++ b/samples/forty/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=forty +OBJECTS = $(PROGRAM).obj card.obj canvas.obj game.obj pile.obj playerdg.obj scoredg.obj scorefil.obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/fractal/makefile.nt b/samples/fractal/makefile.nt deleted file mode 100644 index dba4bea5b3..0000000000 --- a/samples/fractal/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds fractal example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\fractal -PROGRAM=fractal - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/fractal/makefile.vc b/samples/fractal/makefile.vc new file mode 100644 index 0000000000..3023708cc5 --- /dev/null +++ b/samples/fractal/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=fractal +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/grid/makefile.nt b/samples/grid/makefile.nt deleted file mode 100644 index 04d14ef90a..0000000000 --- a/samples/grid/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds wxGrid example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\grid -PROGRAM=test - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc new file mode 100644 index 0000000000..4ada748eda --- /dev/null +++ b/samples/grid/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=test +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc new file mode 100644 index 0000000000..3cbe3b33c2 --- /dev/null +++ b/samples/help/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=demo +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/image/makefile.nt b/samples/image/makefile.nt deleted file mode 100644 index c2b083308f..0000000000 --- a/samples/image/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds image example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\image -PROGRAM=image - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc new file mode 100644 index 0000000000..bea2786e6a --- /dev/null +++ b/samples/image/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=image +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/internat/makefile.nt b/samples/internat/makefile.nt deleted file mode 100644 index 22d7e49d62..0000000000 --- a/samples/internat/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds internat example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\internat -PROGRAM=internat - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc new file mode 100644 index 0000000000..ea79cd92b1 --- /dev/null +++ b/samples/internat/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=internat +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/joytest/makefile.nt b/samples/joytest/makefile.nt deleted file mode 100644 index ca7ec0c46a..0000000000 --- a/samples/joytest/makefile.nt +++ /dev/null @@ -1,63 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds joytest example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\joytest -PROGRAM=joytest - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc new file mode 100644 index 0000000000..a4ef6737c2 --- /dev/null +++ b/samples/joytest/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=joytest +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/layout/makefile.nt b/samples/layout/makefile.nt deleted file mode 100644 index 03d63b800b..0000000000 --- a/samples/layout/makefile.nt +++ /dev/null @@ -1,63 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds layout example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\layout -PROGRAM=layout - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).h $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb - diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc new file mode 100644 index 0000000000..95590f8f6f --- /dev/null +++ b/samples/layout/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=layout +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/listctrl/makefile.nt b/samples/listctrl/makefile.nt deleted file mode 100644 index 20f661061c..0000000000 --- a/samples/listctrl/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds wxListCtrl example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\listctrl -PROGRAM=listtest - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(PROGRAM).h $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc new file mode 100644 index 0000000000..ae556a5be7 --- /dev/null +++ b/samples/listctrl/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=listtest +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/makefile.nt b/samples/makefile.vc similarity index 51% rename from samples/makefile.nt rename to samples/makefile.vc index ec5f6e6fb2..e016ae83ef 100644 --- a/samples/makefile.nt +++ b/samples/makefile.vc @@ -1,5 +1,5 @@ # -# File: makefile.nt +# File: makefile.vc # Author: Julian Smart # Created: 1993 # Updated: @@ -16,144 +16,144 @@ WXDIR = $(WXWIN) THISDIR=$(WXDIR)\samples -!include $(WXDIR)\src\ntwxwin.mak +!include $(WXDIR)\src\makevc.env DEBUG_FLAGS="/Zi /FR" LINK_DEBUG_FLAGS="/RELEASE" all: cd $(WXDIR)\samples\splitter - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\resource - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\controls - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\listctrl - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\treectrl - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\validate - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\mdi - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\minimal - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\layout - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\printing - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\toolbar - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\dialogs - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\docview - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\docvwmdi - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\controls - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\nativdlg - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\grid - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\internat - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\dnd - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\joytest - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\taskbar - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\sashtest - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) !if "$(FINAL)" == "0" cd $(WXDIR)\samples\memcheck !endif - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\ownerdrw - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\checklst - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\minifram - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\bombs - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\fractal - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\wxpoem - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\typetest - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\proplist - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\image - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) # cd $(WXDIR)\samples\regtest -# nmake -f makefile.nt FINAL=$(FINAL) +# nmake -f makefile.vc FINAL=$(FINAL) clean: cd $(WXDIR)\samples\splitter - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\mdi - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\minimal - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\layout - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\printing - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\toolbar - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\dialogs - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\resource - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\listctrl - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\treectrl - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\validate - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\docview - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\docvwmdi - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\controls - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\nativdlg - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\grid - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\internat - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\checklst - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\ownerdrw - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\dnd - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\joytest - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\regtest - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\taskbar - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\sashtest - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\memcheck - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\minifram - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\bombs - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\fractal - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\wxpoem - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\typetest - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\proplist - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\samples\image - nmake -f makefile.nt clean + nmake -f makefile.vc clean diff --git a/samples/mdi/makefile.nt b/samples/mdi/makefile.nt deleted file mode 100644 index c79a4f8d78..0000000000 --- a/samples/mdi/makefile.nt +++ /dev/null @@ -1,63 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds mdi example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\mdi -PROGRAM=mdi - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc new file mode 100644 index 0000000000..058942ba05 --- /dev/null +++ b/samples/mdi/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=mdi +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/memcheck/makefile.nt b/samples/memcheck/makefile.nt deleted file mode 100644 index b7e8851d20..0000000000 --- a/samples/memcheck/makefile.nt +++ /dev/null @@ -1,62 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds memcheck example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\memcheck -PROGRAM=memcheck - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc new file mode 100644 index 0000000000..68389020ba --- /dev/null +++ b/samples/memcheck/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=memcheck +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/mfc/makefile.nt b/samples/mfc/makefile.nt deleted file mode 100644 index 3564096b50..0000000000 --- a/samples/mfc/makefile.nt +++ /dev/null @@ -1,66 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds MFC/wxWin example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -EXTRALIBS=# mfc42.lib -EXTRAINC=-Ig:\DevStudio\mfc\include -EXTRAFLAGS=/D_AFXDLL - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\mfc -PROGRAM=mfctest - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).h $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb - diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc new file mode 100644 index 0000000000..569d33850c --- /dev/null +++ b/samples/mfc/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=mfctest +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/minifram/makefile.nt b/samples/minifram/makefile.nt deleted file mode 100644 index 64f2260de2..0000000000 --- a/samples/minifram/makefile.nt +++ /dev/null @@ -1,62 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds buttnbar example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\toolbar -PROGRAM=test - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).h $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb diff --git a/samples/minifram/makefile.vc b/samples/minifram/makefile.vc new file mode 100644 index 0000000000..4ada748eda --- /dev/null +++ b/samples/minifram/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=test +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/minimal/makefile.nt b/samples/minimal/makefile.nt deleted file mode 100644 index 0416630669..0000000000 --- a/samples/minimal/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds minimal example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\minimal -PROGRAM=minimal - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc new file mode 100644 index 0000000000..35aefc474c --- /dev/null +++ b/samples/minimal/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=minimal +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/nativdlg/makefile.nt b/samples/nativdlg/makefile.nt deleted file mode 100644 index b143f84a28..0000000000 --- a/samples/nativdlg/makefile.nt +++ /dev/null @@ -1,63 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds nativdlg example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\nativdlg -PROGRAM=nativdlg - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).h $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc dialog1.rc - $(rc) -r /i$(WXDIR)\include /D__WXMSW__ -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb - diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc new file mode 100644 index 0000000000..542c1f04dd --- /dev/null +++ b/samples/nativdlg/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=nativdlg +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/notebook/makefile.nt b/samples/notebook/makefile.nt deleted file mode 100644 index 2340423007..0000000000 --- a/samples/notebook/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds notebook example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\notebook -PROGRAM=test - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc new file mode 100644 index 0000000000..4ada748eda --- /dev/null +++ b/samples/notebook/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=test +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/oleauto/makefile.nt b/samples/oleauto/makefile.nt deleted file mode 100644 index 204225909d..0000000000 --- a/samples/oleauto/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds oleauto example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\oleauto -PROGRAM=oleauto - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc new file mode 100644 index 0000000000..2e1852f568 --- /dev/null +++ b/samples/oleauto/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=oleauto +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/ownerdrw/makefile.nt b/samples/ownerdrw/makefile.nt deleted file mode 100644 index 5976dadeb2..0000000000 --- a/samples/ownerdrw/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds ownerdrw example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\ownerdrw -PROGRAM=ownerdrw - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc new file mode 100644 index 0000000000..eaafee8621 --- /dev/null +++ b/samples/ownerdrw/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=ownerdrw +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/png/makefile.nt b/samples/png/makefile.nt deleted file mode 100644 index 81a3e4df06..0000000000 --- a/samples/png/makefile.nt +++ /dev/null @@ -1,66 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds pngdemo example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -EXTRALIBS=$(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\png -PROGRAM=pngdemo - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/png/makefile.vc b/samples/png/makefile.vc new file mode 100644 index 0000000000..9991d8aa94 --- /dev/null +++ b/samples/png/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=pngdemo +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/printing/makefile.nt b/samples/printing/makefile.nt deleted file mode 100644 index 92a5d171f0..0000000000 --- a/samples/printing/makefile.nt +++ /dev/null @@ -1,62 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds printing example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\printing -PROGRAM=printing - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).h $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc new file mode 100644 index 0000000000..d3430e9401 --- /dev/null +++ b/samples/printing/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=printing +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/proplist/makefile.nt b/samples/proplist/makefile.nt deleted file mode 100644 index 88441eaff9..0000000000 --- a/samples/proplist/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds test example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\test -PROGRAM=test - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/proplist/makefile.vc b/samples/proplist/makefile.vc new file mode 100644 index 0000000000..4ada748eda --- /dev/null +++ b/samples/proplist/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=test +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/regtest/makefile.nt b/samples/regtest/makefile.nt deleted file mode 100644 index df589af4ee..0000000000 --- a/samples/regtest/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds regtest example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\regtest -PROGRAM=regtest - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc new file mode 100644 index 0000000000..2639a0c3bf --- /dev/null +++ b/samples/regtest/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=regtest +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/resource/makefile.nt b/samples/resource/makefile.nt deleted file mode 100644 index 8d10573010..0000000000 --- a/samples/resource/makefile.nt +++ /dev/null @@ -1,63 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds resource example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\resource -PROGRAM=resource - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).h $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc dialog1.wxr menu1.wxr - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb - diff --git a/samples/resource/makefile.vc b/samples/resource/makefile.vc new file mode 100644 index 0000000000..103fa7f6bd --- /dev/null +++ b/samples/resource/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=resource +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/sashtest/makefile.nt b/samples/sashtest/makefile.nt deleted file mode 100644 index 99fa33d92b..0000000000 --- a/samples/sashtest/makefile.nt +++ /dev/null @@ -1,51 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds sashtest example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -PROGRAM=sashtest -PROGOBJECTS = $(PROGRAM).obj - -all: $(PROGRAM) - -$(PROGRAM): $(PROGRAM).exe - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(PROGOBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(PROGOBJECTS) $(PROGRAM).res -$(LIBS) -<< - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb - diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc new file mode 100644 index 0000000000..878493df48 --- /dev/null +++ b/samples/sashtest/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=sashtest +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/splitter/makefile.nt b/samples/splitter/makefile.nt deleted file mode 100644 index 2f0685d4c8..0000000000 --- a/samples/splitter/makefile.nt +++ /dev/null @@ -1,63 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1997 -# Updated: -# Copyright: (c) 1997, Julian Smart -# -# "%W% %G%" -# -# Makefile : Builds wxSplitterWindow sample MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) -WXSPLITDIR = $(WXDIR)\samples\splitter -THISDIR = $(WXDIR)\samples\splitter - -!include $(WXDIR)\src\ntwxwin.mak - -PROGRAM=test - -PROGOBJECTS = $(PROGRAM).obj - -all: $(PROGRAM) - -$(PROGRAM): $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(PROGOBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(PROGOBJECTS) $(PROGRAM).res -$(LIBS) -<< - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb - diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc new file mode 100644 index 0000000000..4ada748eda --- /dev/null +++ b/samples/splitter/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=test +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/tab/makefile.nt b/samples/tab/makefile.nt deleted file mode 100644 index fa9f825902..0000000000 --- a/samples/tab/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds tab example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\tab -PROGRAM=test - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/tab/makefile.vc b/samples/tab/makefile.vc new file mode 100644 index 0000000000..4ada748eda --- /dev/null +++ b/samples/tab/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=test +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/taskbar/makefile.nt b/samples/taskbar/makefile.nt deleted file mode 100644 index 459749a077..0000000000 --- a/samples/taskbar/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds tab example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\taskbar -PROGRAM=tbtest - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc new file mode 100644 index 0000000000..80b7c1a4c7 --- /dev/null +++ b/samples/taskbar/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=tbtest +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/thread/makefile.nt b/samples/thread/makefile.nt deleted file mode 100644 index 8053ec781a..0000000000 --- a/samples/thread/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds thread example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\test -PROGRAM=test - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc new file mode 100644 index 0000000000..4ada748eda --- /dev/null +++ b/samples/thread/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=test +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/toolbar/makefile.nt b/samples/toolbar/makefile.nt deleted file mode 100644 index 64f2260de2..0000000000 --- a/samples/toolbar/makefile.nt +++ /dev/null @@ -1,62 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds buttnbar example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\toolbar -PROGRAM=test - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).h $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc new file mode 100644 index 0000000000..4ada748eda --- /dev/null +++ b/samples/toolbar/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=test +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc new file mode 100644 index 0000000000..e784412750 --- /dev/null +++ b/samples/treectrl/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=treetest +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/typetest/makefile.nt b/samples/typetest/makefile.nt deleted file mode 100644 index 1835717c47..0000000000 --- a/samples/typetest/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds typetest example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\typetest -PROGRAM=typetest - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc new file mode 100644 index 0000000000..f6b3d288bc --- /dev/null +++ b/samples/typetest/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=typetest +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/validate/makefile.nt b/samples/validate/makefile.nt deleted file mode 100644 index 2e900f4447..0000000000 --- a/samples/validate/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds validate example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\validate -PROGRAM=validate - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) validate.h $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include /i$(WXDIR)\src\msw\fafa -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc new file mode 100644 index 0000000000..0db26a276c --- /dev/null +++ b/samples/validate/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=validate +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/wxpoem/makefile.nt b/samples/wxpoem/makefile.nt deleted file mode 100644 index 1b48fb3c7b..0000000000 --- a/samples/wxpoem/makefile.nt +++ /dev/null @@ -1,64 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds wxpoem example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\samples\wxpoem -PROGRAM=wxpoem - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/samples/wxpoem/makefile.vc b/samples/wxpoem/makefile.vc new file mode 100644 index 0000000000..8bf4582799 --- /dev/null +++ b/samples/wxpoem/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=wxpoem +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/wxsocket/client.vc b/samples/wxsocket/client.vc new file mode 100644 index 0000000000..9cfde2648f --- /dev/null +++ b/samples/wxsocket/client.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=client +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/samples/wxsocket/makefile.nt b/samples/wxsocket/makefile.nt deleted file mode 100644 index 4bd3188caa..0000000000 --- a/samples/wxsocket/makefile.nt +++ /dev/null @@ -1,61 +0,0 @@ -# -# File: makefile.nt -# Author: Stefan Hammes (stefan.hammes@urz.uni-heidelberg.de) / Julian Smart / Petr Houser (1996) -# Created: 1995 -# Updated:=09 -# -# "%W% %G%" -# -# Makefile : Builds wxSock library for Windows NT / Win95 - -EXTRALIBS=wsock32.lib - -!include <..\..\src\ntwxwin.mak> - -# Change WXDIR or WXWIN to wherever wxWindows is found -#WXWIN = $(WX) -#WXDIR = $(WXWIN) -#WXINC = $(WXDIR)\include\msw - -#WXSOCKDIR = $(WXDIR)\contrib\wxsock -#WXSOCKINC = $(WXSOCKDIR) -#WXSOCKLIB = $(WXSOCKDIR)\lib\wxsock.lib $(WXSOCKDIR)\lib\zlib.lib - -#INC=-I$(WXBASEINC) -I$(WXINC) # -I$(WXSOCKINC) -#WXLIB = $(WXDIR)\lib\wx.lib -#LIBS=$(WXSOCKLIB) wsock32.lib $(LIBS) -#LIBS=$(WXSOCKLIB) wsock32.lib $(LIBS) -#LIBS=$(WXLIB) $(WXSTRINGLIB) oldnames libw llibcew llibce commdlg shell - -all: client.exe server.exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt - cd $(ITSYDIR) - -client.exe: $(WXDIR)\src\msw\dummy.obj $(WXLIB) client.obj\ - client.res - $(link) -out:client.exe $(LINKFLAGS) $(DUMMYOBJ) client.obj \ - client.res $(LIBS) - -server.exe: $(WXDIR)\src\msw\dummy.obj $(WXLIB) server.obj - $(link) -out:server.exe $(LINKFLAGS) $(DUMMYOBJ) server.obj $(LIBS) - -client.obj: client.$(SRCSUFF) - $(cc) $(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) - -client.res: client.rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ client.rc - - -server.obj: server.$(SRCSUFF) - $(cc) $(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) - -clean: - -erase *.obj - -erase *.exe - -erase *.lib - -erase *.res - -erase *.sbr - -erase *.pdb diff --git a/samples/wxsocket/server.vc b/samples/wxsocket/server.vc new file mode 100644 index 0000000000..fdb3bce078 --- /dev/null +++ b/samples/wxsocket/server.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=server +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/src/common/dosyacc.c b/src/common/dosyacc.c index 269cea2073..3220c8dd7b 100644 --- a/src/common/dosyacc.c +++ b/src/common/dosyacc.c @@ -25,7 +25,6 @@ int yyback(int *, int); /* You may need to put /DLEX_SCANNER in your makefile * if you're using LEX! - Last change: JS 13 Jul 97 6:12 pm */ #ifdef LEX_SCANNER /* int yyoutput(int); */ diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp index 4bb0b3a77c..2a2eeb014c 100644 --- a/src/generic/scrolwin.cpp +++ b/src/generic/scrolwin.cpp @@ -20,10 +20,6 @@ #include "wx/utils.h" #include "wx/dcclient.h" -#ifdef __WXMSW__ -#include "windows.h" -#endif - #ifdef __BORLANDC__ #pragma hdrstop #endif @@ -40,6 +36,10 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow) #endif +#ifdef __WXMSW__ +#include "windows.h" +#endif + wxScrolledWindow::wxScrolledWindow(void) { m_xScrollPixelsPerLine = 0; @@ -110,6 +110,7 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY, if (do_refresh && !noRefresh) Refresh(); #ifdef __WXMSW__ + // Necessary? UpdateWindow ((HWND) GetHWND()); #endif } @@ -420,6 +421,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos ) Refresh(); #ifdef __WXMSW__ + // Necessary? ::UpdateWindow ((HWND) GetHWND()); #endif } diff --git a/src/makefile.nt b/src/makefile.vc similarity index 96% rename from src/makefile.nt rename to src/makefile.vc index a6681a2230..5ad7dee96a 100644 --- a/src/makefile.nt +++ b/src/makefile.vc @@ -14,7 +14,7 @@ # dll builds a library (wxdll.lib) suitable for creating DLLs # * Note that the dll target is experimental - see docs/dll.txt. # -!include +!include THISDIR=$(WXWIN)\src diff --git a/src/makeg95.env b/src/makeg95.env index 53fcbc41c9..236b95ae28 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -107,7 +107,7 @@ RANLIB = ranlib #COMPLIBS=-lgcc # Compiler or system-specific include paths -COMPPATHS=-I$(TWINDIR)/include -DTWIN32 -D__TWIN32__ +COMPPATHS= ########################## Directories ############################### diff --git a/src/makelib.vc b/src/makelib.vc new file mode 100644 index 0000000000..8b5b459d80 --- /dev/null +++ b/src/makelib.vc @@ -0,0 +1,42 @@ +# +# File: makelib.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds a library for a utility +# Use FINAL=1 argument to nmake to build final version with no debugging +# info + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +!include $(WXDIR)\src\makevc.env + +all: $(LIBTARGET) + +wx: + cd $(WXDIR)\src\msw + nmake -f makefile.vc FINAL=$(FINAL) + +wxclean: + cd $(WXDIR)\src\msw + nmake -f makefile.vc clean + +$(LIBTARGET): $(OBJECTS) + -erase $(LIBTARGET) + $(implib) @<< +-out:$(LIBTARGET) +-machine:$(CPU) +$(OBJECTS) +<< + +clean: + -erase $(LIBTARGET) + -erase $(OBJECTS) + -erase *.exe + -erase *.res + -erase *.map + -erase *.sbr + -erase *.pdb diff --git a/src/makeprog.env b/src/makeprog.env index aea563b7df..fa6e4884bf 100644 --- a/src/makeprog.env +++ b/src/makeprog.env @@ -1,3 +1,4 @@ +# Make environment for making samples on Unix # Replace this with your own path if necessary WXDIR = $(WXWIN) #WXDIR = /home/jacs/wx2 diff --git a/samples/treectrl/makefile.nt b/src/makeprog.vc similarity index 56% rename from samples/treectrl/makefile.nt rename to src/makeprog.vc index 59cf33ab3b..b3eb9138b2 100644 --- a/samples/treectrl/makefile.nt +++ b/src/makeprog.vc @@ -1,13 +1,12 @@ # # File: makefile.nt # Author: Julian Smart -# Created: 1997 +# Created: 1999 # Updated: -# Copyright: +# Copyright: (c) Julian Smart # -# "%W% %G%" -# -# Makefile : Builds wxTreeCtrl example (MS VC++). +# Makefile environment for building samples. Include this from +# your own makefile. # Use FINAL=1 argument to nmake to build final version with no debugging # info @@ -16,26 +15,19 @@ WXDIR = $(WXWIN) WXUSINGDLL=0 -!include $(WXDIR)\src\ntwxwin.mak +!include $(WXDIR)\src\makevc.env -THISDIR = $(WXDIR)\samples\treectrl -PROGRAM=treetest - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe +all: $(PROGRAM).exe $(EXTRATARGETS) wx: cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) + nmake -f makefile.vc FINAL=$(FINAL) +# cd $(THISDIR) wxclean: cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) + nmake -f makefile.vc clean +# cd $(THISDIR) $(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res $(link) @<< @@ -45,18 +37,11 @@ $(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res $(LIBS) << - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) -<< - $(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - clean: - -erase *.obj + -erase $(OBJECTS) -erase *.exe -erase *.res -erase *.map diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index 3e68b6bcaa..0cc095c666 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -26,9 +26,10 @@ #include "wx/window.h" #endif -#include "wx/msw/private.h" #include "wx/msw/accel.h" +#include "wx/msw/private.h" + #ifdef LoadAccelerators #undef LoadAccelerators #endif diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 97cdd6eecb..49f7945204 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -691,7 +691,7 @@ $(CFG): makefile.b32 -WE -tWM --I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib +-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm -I$(WXDIR)\include\wx\msw\gnuwin32 -L$(BCCDIR)\lib diff --git a/src/msw/makefile.nt b/src/msw/makefile.vc similarity index 95% rename from src/msw/makefile.nt rename to src/msw/makefile.vc index ef65744b9b..09b9999643 100644 --- a/src/msw/makefile.nt +++ b/src/msw/makefile.vc @@ -14,7 +14,7 @@ # dll builds a library (wxdll.lib) suitable for creating DLLs # * Note that the dll target is experimental - see docs/dll.txt. # -!include <..\ntwxwin.mak> +!include <..\makevc.env> THISDIR=$(WXWIN)\src\msw @@ -241,15 +241,15 @@ all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm $(LIBTARGET) # wxWindows library as DLL dll: - nmake -f makefile.nt all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 + nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 # wxWindows + app as DLL. Only affects main.cpp. dllapp: - nmake -f makefile.nt all FINAL=$(FINAL) DLL=1 + nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 # wxWindows + app as DLL, for Netscape plugin - remove DllMain. dllnp: - nmake -f makefile.nt all NOMAIN=1 FINAL=$(FINAL) DLL=1 + nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 # Use this to make dummy.obj and generate a PCH. # You might use the dll target, then the pch target, in order to @@ -262,7 +262,7 @@ dllnp: # or an app is calling the DLL exported functionality (WXDLLEXPORT is different # in each case) so you couldn't use the same PCH. pch: - nmake -f makefile.nt pch1 WXUSINGDLL=1 + nmake -f makefile.vc pch1 WXUSINGDLL=1 pch1: $(DUMMYOBJ) @@ -1199,37 +1199,37 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h png: cd $(WXDIR)\src\png - nmake -f makefile.nt FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) cd $(WXDIR)\src\msw clean_png: cd $(WXDIR)\src\png - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\src\msw zlib: cd $(WXDIR)\src\zlib - nmake -f makefile.nt FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) cd $(WXDIR)\src\msw clean_zlib: cd $(WXDIR)\src\zlib - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\src\msw xpm: cd $(WXDIR)\src\xpm - nmake -f makefile.nt FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) cd $(WXDIR)\src\msw clean_xpm: cd $(WXDIR)\src\xpm - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\src\msw rcparser: cd $(WXDIR)\utils\rcparser\src - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm @@ -1301,99 +1301,99 @@ portingps: $(WXDIR)\docs\ps\porting.ps allhlp: wxhlp portinghlp prop # faqhlp cd $(WXDIR)\utils\dialoged\src - nmake -f makefile.nt hlp + nmake -f makefile.vc hlp cd $(THISDIR) # cd $(WXDIR)\utils\wxhelp\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\wxhelp2\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\prologio\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\tex2rtf\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\wxgraph\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\wxchart\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\wxtree\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\wxbuild\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\wxgrid\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\wxtab\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\wxclips\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp # cd $(WXDIR)\utils\clips2c\src -# nmake -f makefile.nt hlp +# nmake -f makefile.vc hlp allhtml: wxhtml portinghtml prophtml # faqhtml cd $(WXDIR)\utils\dialoged\src - nmake -f makefile.nt html + nmake -f makefile.vc html cd $(THISDIR) -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\dialoged\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\hytext\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\wxhelp\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\wxhelp2\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\prologio\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\tex2rtf\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\wxgraph\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\wxchart\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\wxtree\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\wxtab\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\wxclips\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html # cd $(WXDIR)\utils\clips2c\src -# nmake -f makefile.nt html +# nmake -f makefile.vc html allps: wxps referencps portingps propps # faqps cd $(WXDIR)\utils\dialoged\src - nmake -f makefile.nt ps + nmake -f makefile.vc ps cd $(THISDIR) allpdfrtf: pdfrtf portingpdfrtf proppdfrtf # faqpdfrtf cd $(WXDIR)\utils\dialoged\src - nmake -f makefile.nt pdfrtf + nmake -f makefile.vc pdfrtf cd $(THISDIR) # cd $(WXDIR)\utils\wxhelp\src -# nmake -f makefile.nt ps +# nmake -f makefile.vc ps # cd $(WXDIR)\utils\wxhelp2\src -# nmake -f makefile.nt ps +# nmake -f makefile.vc ps # cd $(WXDIR)\utils\tex2rtf\src -# nmake -f makefile.nt ps +# nmake -f makefile.vc ps # cd $(WXDIR)\utils\wxgraph\src -# nmake -f makefile.nt ps +# nmake -f makefile.vc ps # cd $(WXDIR)\utils\wxchart\src -# nmake -f makefile.nt ps +# nmake -f makefile.vc ps # cd $(WXDIR)\utils\wxtree\src -# nmake -f makefile.nt ps +# nmake -f makefile.vc ps # cd $(THISDIR) # cd $(WXDIR)\utils\wxtab\src -# nmake -f makefile.nt ps +# nmake -f makefile.vc ps # cd $(WXDIR)\utils\prologio\src -# nmake -f makefile.nt ps +# nmake -f makefile.vc ps # cd $(WXDIR)\utils\wxclips\src -# nmake -f makefile.nt ps +# nmake -f makefile.vc ps # cd $(WXDIR)\utils\clips2c\src -# nmake -f makefile.nt ps +# nmake -f makefile.vc ps $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj cd $(DOCDIR)/latex/wx diff --git a/src/ntwxwin.mak b/src/ntwxwin.mak index 01d08574fd..28cbb18dcc 100644 --- a/src/ntwxwin.mak +++ b/src/ntwxwin.mak @@ -1,172 +1,3 @@ -# -# File: ntwxwin.env -# Author: Ulrich Leodolter -# Created: Wed May 17 08:36:42 1995 -# Updated: -# -# MSVC++ 32-bit makefile include file -# -!include - -WIN95=1 - -!if "$(WIN95)" == "0" -# With 3.50, Win95 will use your existing icons to show smaller ones. -# With 4.0, you'll have to follow Win95 procedures for icons or you'll get the -# default Windows icon. -APPVER=3.50 -WINVERSION=-DWINVER=0x0350 # Generic WIN32 -!else -APPVER=3.50 # 4.0 -# This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0). -WINVERSION=-DWINVER=0x0400 /D__WIN95__ -!endif - -# On Alpha machines, change to CPU=ALPHA -CPU=i386 - -# Suffixes -OBJSUFF=obj -SRCSUFF=cpp - -# If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION) -#WINLINKFLAGS=/NODEFAULTLIB /INCREMENTAL:NO /NOLOGO -align:0x1000 -machine:$(CPU) -subsystem:windows,$(APPVER) -WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER) -#WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib libc.lib oldnames.lib\ -# comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib # libci.lib # libci.lib required for VC++ 4.2 -WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\ - comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib # libci.lib # libci.lib required for VC++ 4.2 - -# Change this to your WXWIN directory -WXDIR=$(WXWIN) - -WXSRC=$(WXDIR)\src\msw -WXINC=$(WXDIR)\include -WXBASESRC=$(WXDIR)\src\common - -##################################################################### -# These are the possible DLL/non-DLL usages: -# -# Type _DLL/_WINDLL WXUSINGDLL WXMAKINGDLL Library -#-------------------------------------------------------------------- -# Normal application - - - wx.lib -# -# wxWin as DLL Defined - Defined wx200.lib -# -# App using wxWin DLL - Defined - wx200.lib -# -# App built as one DLL Defined - - wx.lib -# -###################################################################### -# -# Compiling your app: -#-------------------- -# when compiling an app to use the DLL version of wxWindows -# (but not to be a DLL itself), set WXUSINGDLL to 1 in your -# makefile just before including ntwxwin.mak. -# To compile wxWin _and_ app itself as a DLL, set DLL to 1 -# in ntwxwin.mak, and do not set WXUSINGDLL. -# -# Compiling wxWindows: -#--------------------- -# Use the dll target to compile wxWindows as DLL; then make 'pch' -# to generate a precompiled header for your apps to use. BUG: must compile without -# wxExpr (USE_WX_RESOURCES = 0) for this to link properly. Don't know why yet. -# Use the dllapp target to compile wxWindows for making a DLL app (not implemented yet) - -#DLL=0 - -!if "$(WXUSINGDLL)" == "1" || "$(WXMAKINGDLL)" == "1" -WXLIB=$(WXDIR)\lib\wx200.lib -!else -WXLIB=$(WXDIR)\lib\wx.lib -!endif - -!if "$(WXUSINGDLL)" == "1" -EXTRADLLFLAGS=/DWXUSINGDLL=1 -!endif - -!if "$(WXMAKINGDLL)" == "1" -EXTRADLLFLAGS=/DWXMAKINGDLL=1 -!endif - -!if "$(WXMAKINGDLL)" == "0" && "$(DLL)" == "1" -EXTRADLLFLAGS= -!endif - -!if "$(NOMAIN)" == "1" -EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN -!endif - -INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC) -LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib - -!ifndef FINAL -FINAL=0 -DEBUG=1 -!endif - -!ifndef DLL -DLL=0 -!endif - -# Set this to 1 if you don't want to use precompiled headers -!ifndef NOPCH -NOPCH=0 -!endif - -MAKEPRECOMP=/YcWX/WXPREC.H -OPTIONS= - -!if "$(FINAL)" == "0" -OPT = /Od /Gy -# ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated -DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR -LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE -CRTFLAG=/MD -!else -# /O1 - smallest code -# /O2 - fastest code -OPT = /O1 # /O2 # /Od -DEBUG_FLAGS= -LINK_DEBUG_FLAGS=/RELEASE -CRTFLAG=/MD -!endif - -!if "$(DLL)" == "0" - -!if "$(NOPCH)" == "1" -PCH= -PRECOMP= -MAKEPRECOMP= -!else -PCH=WX.PCH -PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb -MAKEPRECOMP=/YcWX/WXPREC.H -!endif - -CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS) -# If you don't include wxprec.h, use CPPFLAGS2 -CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS) -LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup -DUMMY=dummy - -!else - -!if "$(WXMAKINGDLL)" == "1" -PCH=WXDLL.PCH -DUMMY=dummydll -!else -PCH=WX.PCH -DUMMY=dummy -!endif - -PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb -CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL -CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL -LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY) -!endif - -DUMMYOBJ=$(WXDIR)\src\msw\$(DUMMY).obj +# Compatibility only: use makevc.env +!include $(WXWIN)\src\makevc.env diff --git a/src/png/makefile.nt b/src/png/makefile.vc similarity index 100% rename from src/png/makefile.nt rename to src/png/makefile.vc diff --git a/src/stubs/makefile.nt b/src/stubs/makefile.vc similarity index 99% rename from src/stubs/makefile.nt rename to src/stubs/makefile.vc index ff4e97cc0d..18136ec664 100644 --- a/src/stubs/makefile.nt +++ b/src/stubs/makefile.vc @@ -1,5 +1,5 @@ # -# File: makefile.nt +# File: makefile.vc # Author: Julian Smart # Created: 1997 # Updated: diff --git a/src/xpm/makefile.nt b/src/xpm/makefile.vc similarity index 99% rename from src/xpm/makefile.nt rename to src/xpm/makefile.vc index ad52164624..4dad3c0d52 100644 --- a/src/xpm/makefile.nt +++ b/src/xpm/makefile.vc @@ -9,7 +9,7 @@ # # Makefile : Builds xpm.lib for VC++ (32-bit) # -!include <..\ntwxwin.mak> +!include <..\makevc.env> THISDIR=$(WXWIN)\src\xpm diff --git a/src/zlib/makefile.nt b/src/zlib/makefile.vc similarity index 100% rename from src/zlib/makefile.nt rename to src/zlib/makefile.vc diff --git a/utils/dialoged/src/makefile.nt b/utils/dialoged/src/makefile.vc similarity index 87% rename from utils/dialoged/src/makefile.nt rename to utils/dialoged/src/makefile.vc index 2b0ea7f5db..2cd2b30b2f 100644 --- a/utils/dialoged/src/makefile.nt +++ b/utils/dialoged/src/makefile.vc @@ -1,13 +1,13 @@ # -# File: makefile.nt +# File: makefile.vc # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: (c) 1993-1999 Julian Smart # # "%W% %G%" # -# Makefile : Builds wxProperty classes library (MS VC++). +# Makefile : Builds Dialog Editor (MS VC++). # Use FINAL=1 argument to nmake to build final version with no debugging # info @@ -17,33 +17,16 @@ THISDIR = $(WXDIR)\utils\dialoged\src DOCDIR=$(WXDIR)\docs LOCALDOCDIR=$(WXDIR)\utils\dialoged\docs -!include $(WXDIR)\src\ntwxwin.mak - PROGRAM=dialoged OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\ winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj +!include $(WXDIR)\src\makeprog.vc + + all: dialoged.exe -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - dialoged.obj: winprop.h reseditr.h dialoged.$(SRCSUFF) $(DUMMYOBJ) $(cc) @<< $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) diff --git a/utils/glcanvas/samples/cube/makefile.nt b/utils/glcanvas/samples/cube/makefile.nt deleted file mode 100644 index 7f6d11c680..0000000000 --- a/utils/glcanvas/samples/cube/makefile.nt +++ /dev/null @@ -1,66 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1997 -# Updated: -# -# "%W% %G%" -# -# Makefile : Builds cube example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -EXTRAINC=-I..\..\win -EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\utils\glcanvas\samples\cube -PROGRAM=cube - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(PROGRAM).h $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/utils/glcanvas/samples/cube/makefile.vc b/utils/glcanvas/samples/cube/makefile.vc new file mode 100644 index 0000000000..997616ea30 --- /dev/null +++ b/utils/glcanvas/samples/cube/makefile.vc @@ -0,0 +1,20 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=cube +OBJECTS = $(PROGRAM).obj +EXTRAINC=-I..\..\win +EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib + +!include $(WXDIR)\src\makeprog.vc + diff --git a/utils/glcanvas/samples/isosurf/makefile.nt b/utils/glcanvas/samples/isosurf/makefile.nt deleted file mode 100644 index 8f82c734b9..0000000000 --- a/utils/glcanvas/samples/isosurf/makefile.nt +++ /dev/null @@ -1,66 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1997 -# Updated: -# -# "%W% %G%" -# -# Makefile : Builds isosurf example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -EXTRAINC=-I..\..\win -EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\utils\glcanvas\samples\isosurf -PROGRAM=isosurf - -OBJECTS = $(PROGRAM).obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(PROGRAM).h $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/utils/glcanvas/samples/isosurf/makefile.vc b/utils/glcanvas/samples/isosurf/makefile.vc new file mode 100644 index 0000000000..be397eddd6 --- /dev/null +++ b/utils/glcanvas/samples/isosurf/makefile.vc @@ -0,0 +1,25 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=isosurf +OBJECTS = $(PROGRAM).obj +EXTRAINC=-I..\..\win +EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib +EXTRATARGETS=isosurf.dat + +!include $(WXDIR)\src\makeprog.vc + +isosurf.dat: isosurf.dat.gz + gzip -c -d isosurf.dat.gz > isosurf.dat + + diff --git a/utils/glcanvas/samples/penguin/makefile.nt b/utils/glcanvas/samples/penguin/makefile.nt deleted file mode 100644 index 507b15cfec..0000000000 --- a/utils/glcanvas/samples/penguin/makefile.nt +++ /dev/null @@ -1,71 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1997 -# Updated: -# -# "%W% %G%" -# -# Makefile : Builds penguin example (MS VC++). -# Use FINAL=1 argument to nmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(WXWIN) - -WXUSINGDLL=0 - -EXTRAINC=-I..\..\win -EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib - -!include $(WXDIR)\src\ntwxwin.mak - -THISDIR = $(WXDIR)\utils\glcanvas\samples\penguin -PROGRAM=penguin - -OBJECTS = $(PROGRAM).obj trackball.obj lw.obj - -$(PROGRAM): $(PROGRAM).exe - -all: wx $(PROGRAM).exe - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res -$(LIBS) -<< - - -$(PROGRAM).obj: $(PROGRAM).$(SRCSUFF) $(PROGRAM).h $(DUMMYOBJ) - $(cc) @<< -$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) -<< - -lw.obj: lw.cpp lw.h - $(cc) @<< -$(CPPFLAGS2) /c $*.$(SRCSUFF) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb diff --git a/utils/glcanvas/samples/penguin/makefile.vc b/utils/glcanvas/samples/penguin/makefile.vc new file mode 100644 index 0000000000..27e4721eaa --- /dev/null +++ b/utils/glcanvas/samples/penguin/makefile.vc @@ -0,0 +1,25 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=penguin +OBJECTS = $(PROGRAM).obj trackball.obj lw.obj +EXTRAINC=-I..\..\win +EXTRALIBS=$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib + +!include $(WXDIR)\src\makeprog.vc + +lw.obj: lw.cpp lw.h + $(cc) @<< +$(CPPFLAGS2) /c $*.$(SRCSUFF) +<< + diff --git a/utils/glcanvas/win/makefile.nt b/utils/glcanvas/win/makefile.vc similarity index 79% rename from utils/glcanvas/win/makefile.nt rename to utils/glcanvas/win/makefile.vc index 6555f44619..8d2c3fa238 100644 --- a/utils/glcanvas/win/makefile.nt +++ b/utils/glcanvas/win/makefile.vc @@ -19,47 +19,16 @@ EXTRALIBS=$(WXDIR)\lib\glcanvas.lib DOCDIR=$(WXDIR)\docs LOCALDOCDIR=$(WXDIR)\utils\glcanvas\docs -!include $(WXDIR)\src\ntwxwin.mak - -PROGRAM=test - -OBJECTS = glcanvas.obj LIBTARGET=$(WXDIR)\lib\glcanvas.lib +OBJECTS = glcanvas.obj -all: $(LIBTARGET) - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) - cd $(THISDIR) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.nt clean - cd $(THISDIR) - -$(LIBTARGET): $(OBJECTS) - -erase $(LIBTARGET) - $(implib) @<< --out:$(LIBTARGET) --machine:$(CPU) -$(OBJECTS) -<< +!include $(WXDIR)\src\makelib.vc glcanvas.obj: glcanvas.h glcanvas.$(SRCSUFF) $(DUMMYOBJ) $(cc) @<< $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) << -clean: - -erase *.obj - -erase *.sbr - -erase *.exe - -erase *.res - -erase *.map - -erase *.pdb - -erase $(LIBTARGET) - DOCSOURCES=$(LOCALDOCDIR)\manual.tex $(LOCALDOCDIR)\classes.tex html: $(DOCDIR)\html\glcanvas\glcanvas.htm diff --git a/utils/makefile.nt b/utils/makefile.vc similarity index 100% rename from utils/makefile.nt rename to utils/makefile.vc diff --git a/utils/nplugin/makefile.nt b/utils/nplugin/makefile.vc similarity index 80% rename from utils/nplugin/makefile.nt rename to utils/nplugin/makefile.vc index a6a1d27258..a35290b4af 100644 --- a/utils/nplugin/makefile.nt +++ b/utils/nplugin/makefile.vc @@ -16,17 +16,17 @@ WXDIR = $(WXWIN) THISDIR=$(WXDIR)\utils\nplugin -!include $(WXDIR)\src\ntwxwin.mak +!include $(WXDIR)\src\makevc.env DEBUG_FLAGS="/Zi /FR" LINK_DEBUG_FLAGS="/RELEASE" clean: cd $(WXDIR)\utils\nplugin\src - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\utils\nplugin\samples\simple - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\utils\nplugin\samples\gui - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(WXDIR)\utils\nplugin diff --git a/utils/nplugin/samples/gui/makefile.nt b/utils/nplugin/samples/gui/makefile.vc similarity index 93% rename from utils/nplugin/samples/gui/makefile.nt rename to utils/nplugin/samples/gui/makefile.vc index b488b0c624..ff01513d0e 100644 --- a/utils/nplugin/samples/gui/makefile.nt +++ b/utils/nplugin/samples/gui/makefile.vc @@ -1,5 +1,5 @@ # -# File: makefile.nt +# File: makefile.vc # Author: Julian Smart # Created: 1997 # Updated: @@ -19,7 +19,7 @@ DLL=1 EXTRAINC=/I$(WXDIR)\utils\nplugin\src -!include $(WXDIR)\src\ntwxwin.mak +!include $(WXDIR)\src\makevc.env THISDIR = $(WXDIR)\utils\nplugin\examples\gui PROGRAM=npgui32 @@ -33,7 +33,7 @@ $(PROGRAM): $(PROGRAM).exe wx: cd $(WXDIR)\src\msw - nmake -f makefile.nt dllnp FINAL=$(FINAL) + nmake -f makefile.vc dllnp FINAL=$(FINAL) cd $(THISDIR) # Update the dynamic link library diff --git a/utils/nplugin/samples/simple/makefile.nt b/utils/nplugin/samples/simple/makefile.vc similarity index 93% rename from utils/nplugin/samples/simple/makefile.nt rename to utils/nplugin/samples/simple/makefile.vc index 0697a4184e..6587d4e853 100644 --- a/utils/nplugin/samples/simple/makefile.nt +++ b/utils/nplugin/samples/simple/makefile.vc @@ -1,5 +1,5 @@ # -# File: makefile.nt +# File: makefile.vc # Author: Julian Smart # Created: 1997 # Updated: @@ -19,7 +19,7 @@ DLL=1 EXTRAINC=/I$(WXDIR)\utils\nplugin\src -!include $(WXDIR)\src\ntwxwin.mak +!include $(WXDIR)\src\makevc.env THISDIR = $(WXDIR)\utils\nplugin\smples\simple PROGRAM=npsimple32 @@ -33,7 +33,7 @@ $(PROGRAM): $(PROGRAM).exe wx: cd $(WXDIR)\src\msw - nmake -f makefile.nt dllnp FINAL=$(FINAL) + nmake -f makefile.vc dllnp FINAL=$(FINAL) cd $(THISDIR) # Update the dynamic link library diff --git a/utils/nplugin/src/makefile.nt b/utils/nplugin/src/makefile.vc similarity index 91% rename from utils/nplugin/src/makefile.nt rename to utils/nplugin/src/makefile.vc index b3e4491221..8493ca3723 100644 --- a/utils/nplugin/src/makefile.nt +++ b/utils/nplugin/src/makefile.vc @@ -1,5 +1,5 @@ # -# File: makefile.nt +# File: makefile.vc # Author: Julian Smart # Created: 1993 # Updated: @@ -17,7 +17,7 @@ WXDIR = $(WXWIN) # Application is a DLL DLL=1 -!include $(WXDIR)\src\ntwxwin.mak +!include $(WXDIR)\src\makevc.env PLUGINDIR = $(WXDIR)\utils\nplugin THISDIR = $(PLUGINDIR)\src @@ -29,12 +29,12 @@ all: $(LIBTARGET) wx: cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(THISDIR) wxclean: cd $(WXDIR)\src\msw - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(THISDIR) $(LIBTARGET): $(OBJECTS) diff --git a/utils/ogl/samples/ogledit/makefile.nt b/utils/ogl/samples/ogledit/makefile.vc similarity index 89% rename from utils/ogl/samples/ogledit/makefile.nt rename to utils/ogl/samples/ogledit/makefile.vc index f49a7ed70b..37336c627a 100644 --- a/utils/ogl/samples/ogledit/makefile.nt +++ b/utils/ogl/samples/ogledit/makefile.vc @@ -1,5 +1,5 @@ # -# File: makefile.nt +# File: makefile.vc # Author: Julian Smart # Created: 1993 # Updated: @@ -14,7 +14,7 @@ # Set WXDIR for your system WXDIR = $(WXWIN) -!include $(WXDIR)\src\ntwxwin.mak +!include $(WXDIR)\src\makevc.env THISDIR = $(WXDIR)\utils\ogl\samples\ogledit @@ -35,17 +35,17 @@ all: $(PROGRAM).exe wx: cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(THISDIR) wxclean: cd $(WXDIR)\src\msw - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(THISDIR) ogl: cd $(OGLDIR)\src - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(THISDIR) $(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(OGLLIB) $(PROGRAM).res @@ -82,7 +82,7 @@ $(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc ogl.ico cleanogl: cd $(OGLDIR)\src - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(THISDIR) clean: diff --git a/utils/ogl/src/makefile.nt b/utils/ogl/src/makefile.vc similarity index 97% rename from utils/ogl/src/makefile.nt rename to utils/ogl/src/makefile.vc index b1b59caa7e..8c5bf6f9b3 100644 --- a/utils/ogl/src/makefile.nt +++ b/utils/ogl/src/makefile.vc @@ -1,5 +1,5 @@ # -# File: makefile.nt +# File: makefile.vc # Author: Julian Smart # Created: 1993 # Updated: @@ -21,7 +21,7 @@ EXTRAFLAGS=/DPROLOGIO=1 DOCDIR=$(WXDIR)\docs LOCALDOCDIR=$(WXDIR)\utils\ogl\docs -!include $(WXDIR)\src\ntwxwin.mak +!include $(WXDIR)\src\makevc.env PROGRAM=test @@ -36,12 +36,12 @@ $(PROGRAM): $(PROGRAM).exe wx: cd $(WXDIR)\src\msw - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.vc FINAL=$(FINAL) cd $(THISDIR) wxclean: cd $(WXDIR)\src\msw - nmake -f makefile.nt clean + nmake -f makefile.vc clean cd $(THISDIR) $(LIBTARGET): $(OBJECTS) diff --git a/utils/tex2rtf/src/makefile.nt b/utils/tex2rtf/src/makefile.vc similarity index 98% rename from utils/tex2rtf/src/makefile.nt rename to utils/tex2rtf/src/makefile.vc index 03e71beca4..a3bf628330 100644 --- a/utils/tex2rtf/src/makefile.nt +++ b/utils/tex2rtf/src/makefile.vc @@ -8,7 +8,7 @@ # # Makefile : Builds Tex2RTF on Windows Windows 95/NT # -!include <..\..\..\src\ntwxwin.mak> +!include <..\..\..\src\makevc.env> TEX2RTFDIR = $(WXDIR)\utils\tex2rtf TEX2RTFINC = $(TEX2RTFDIR)\src diff --git a/utils/wxtree/src/makefile.nt b/utils/wxtree/src/makefile.vc similarity index 97% rename from utils/wxtree/src/makefile.nt rename to utils/wxtree/src/makefile.vc index 5e815db012..26db16510a 100644 --- a/utils/wxtree/src/makefile.nt +++ b/utils/wxtree/src/makefile.vc @@ -15,7 +15,7 @@ WXDIR = $(WXWIN) TREEDIR = $(WXDIR)\utils\wxtree THISDIR = $(WXDIR)\utils\wxtree\src -EXTRALIBS=$(TREEDIR)\lib\wxtree.lib +EXTRALIBS=$(WXDIR)\lib\wxtree.lib DOCDIR=$(WXDIR)\docs LOCALDOCDIR=$(WXDIR)\utils\wxtree\docs @@ -25,7 +25,7 @@ PROGRAM=test OBJECTS = wxtree.obj PROGOBJECTS = $(PROGRAM).obj -LIBTARGET=$(TREEDIR)\lib\wxtree.lib +LIBTARGET=$(WXDIR)\lib\wxtree.lib all: $(LIBTARGET)