Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed .nt makefiles to .vc and factored them out; made DND sample compile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-01-24 19:13:55 +00:00
parent d134d2d49f
commit 48d1144bc4
127 changed files with 1123 additions and 3354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
utils/dialoged/src/makefile.nt → utils/dialoged/src/makefile.vc
View File

@@ -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)

66
utils/glcanvas/samples/cube/makefile.nt
View File

@@ -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

20
utils/glcanvas/samples/cube/makefile.vc Normal file
View File

@@ -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

66
utils/glcanvas/samples/isosurf/makefile.nt
View File

@@ -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

25
utils/glcanvas/samples/isosurf/makefile.vc Normal file
View File

@@ -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

71
utils/glcanvas/samples/penguin/makefile.nt
View File

@@ -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

25
utils/glcanvas/samples/penguin/makefile.vc Normal file
View File

@@ -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)
<<

35
utils/glcanvas/win/makefile.nt → utils/glcanvas/win/makefile.vc
View File

@@ -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

0
utils/makefile.nt → utils/makefile.vc
View File

8
utils/nplugin/makefile.nt → utils/nplugin/makefile.vc
View File

@@ -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

6
utils/nplugin/samples/gui/makefile.nt → utils/nplugin/samples/gui/makefile.vc
View File

@@ -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

6
utils/nplugin/samples/simple/makefile.nt → utils/nplugin/samples/simple/makefile.vc
View File

@@ -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

8
utils/nplugin/src/makefile.nt → utils/nplugin/src/makefile.vc
View File

@@ -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)

12
utils/ogl/samples/ogledit/makefile.nt → utils/ogl/samples/ogledit/makefile.vc
View File

@@ -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:

8
utils/ogl/src/makefile.nt → utils/ogl/src/makefile.vc
View File

@@ -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)

2
utils/tex2rtf/src/makefile.nt → utils/tex2rtf/src/makefile.vc
View File

@@ -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

4
utils/wxtree/src/makefile.nt → utils/wxtree/src/makefile.vc
View File

@@ -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)