AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile and other small corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2001-06-17 18:34:20 +00:00
parent cb35465eec
commit 35820dcb47
8 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/samples/stc/makefile.vc
View File

@ -7,7 +7,7 @@ WXDIR = $(WXWIN)
PROGRAM = stctest
OBJECTS = $(PROGRAM).obj
EXTRALIBS = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib
EXTRALIBS = $(WXDIR)\lib\stc$(LIBEXT).lib
EXTRAINC = -I$(WXDIR)\contrib\include
!include $(WXDIR)\src\makeprog.vc

4
contrib/src/stc/makefile.vc
View File

@ -47,9 +47,7 @@ OBJECTS = \
$(D)\stc.obj \
LIBTARGET = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib
LIBTARGET = $(WXDIR)\lib\stc$(LIBEXT).lib
all: $(D) $(LIBTARGET)

15
distrib/msw/contrib.rsp
View File

@ -78,6 +78,19 @@ contrib/samples/gizmos/splittree/*.rc
contrib/samples/gizmos/splittree/TreeVC.dsp
contrib/samples/gizmos/splittree/TreeVC.dsw
contrib/samples/gizmos/editlbox/*.cpp
contrib/samples/gizmos/editlbox/*.h
contrib/samples/gizmos/editlbox/*.def
contrib/samples/gizmos/editlbox/makefile*
contrib/samples/gizmos/editlbox/*.xbm
contrib/samples/gizmos/editlbox/*.xpm
contrib/samples/gizmos/editlbox/*.txt
contrib/samples/gizmos/editlbox/*.ico
contrib/samples/gizmos/editlbox/*.bmp
contrib/samples/gizmos/editlbox/*.rc
contrib/samples/gizmos/editlbox/EditlboxVC.dsp
contrib/samples/gizmos/editlbox/EditlboxVC.dsw
contrib/src/canvas/*.cpp
contrib/src/canvas/*.h
contrib/src/canvas/make*
@ -98,6 +111,8 @@ contrib/include/wx/plot/*.rc
contrib/src/gizmos/*.cpp
contrib/src/gizmos/*.h
contrib/src/gizmos/make*
contrib/src/gizmos/*.xpm
contrib/src/gizmos/*.bmp
contrib/src/gizmos/GizmosVC.dsp
contrib/src/gizmos/GizmosVC.dsw
contrib/include/wx/gizmos/*.h

1
distrib/msw/makefile.rsp
View File

@ -103,6 +103,7 @@ contrib/samples/canvas/Makefile.in
contrib/samples/gizmos/Makefile.in
contrib/samples/gizmos/multicell/Makefile.in
contrib/samples/gizmos/splittree/Makefile.in
contrib/samples/gizmos/editlbox/Makefile.in
contrib/samples/ogl/Makefile.in
contrib/samples/ogl/ogledit/Makefile.in
contrib/samples/ogl/studio/Makefile.in

5
distrib/msw/xml.rsp
View File

@ -38,7 +38,6 @@ contrib/src/xrc/*.txt
contrib/src/xrc/*.ico
contrib/src/xrc/*.bmp
contrib/src/xrc/README
contrib/src/xrc/FORMAT.txt
contrib/src/xrc/README.EXPAT
contrib/src/xrc/expat/copying.txt
@ -72,8 +71,8 @@ contrib/samples/xrc/XrcDemoVC.dsw
contrib/samples/xrc/rc/*.bmp
contrib/samples/xrc/rc/*.gif
contrib/samples/xrc/rc/*.ico
contrib/samples/xrc/rc/.xpm
contrib/samples/xrc/rc/.xrc
contrib/samples/xrc/rc/*.xpm
contrib/samples/xrc/rc/*.xrc
contrib/utils/convertrc/*.cpp
contrib/utils/convertrc/*.h

14
distrib/msw/zipdistinno.bat
View File

@ -65,6 +65,8 @@ zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
Rem Below is the old-style separated-out format. This is retained only
Rem for local use, and for creating wxMSW-xxx.zip.
@ -180,6 +182,8 @@ unzip32 -o ..\extradoc-%version%.zip
Rem Need Word file, for Remstar DB classes
unzip32 -o ..\wxWindows-%version%-Word.zip
unzip32 -o ..\ogl3-%version%.zip
unzip32 -o ..\mmedia-%version%.zip
unzip32 -o ..\stc-%version%.zip
unzip32 -o ..\jpeg-%version%.zip
unzip32 -o ..\tiff-%version%.zip
unzip32 -o ..\wxxrc-%version%.zip
@ -193,11 +197,11 @@ erase /Y configure samples\configure samples\*.in demos\configure demos\*.in con
erase /Y setup.h.in setup.h_vms
erase /SY Makefile.in
erase /Y docs\html\wxbook.htm docs\html\roadmap.htm
erase /Y contrib\docs\winhelp\mmedia.*
erase /Y contrib\docs\winhelp\stc.*
erase /Y contrib\docs\htmlhelp\mmedia.*
erase /Y contrib\docs\htmlhelp\stc.*
erase /Y contrib\docs\pdf\*.*
Rem erase /Y contrib\docs\winhelp\mmedia.*
Rem erase /Y contrib\docs\winhelp\stc.*
Rem erase /Y contrib\docs\htmlhelp\mmedia.*
Rem erase /Y contrib\docs\htmlhelp\stc.*
Rem erase /Y contrib\docs\pdf\*.*
erase /sxzy contrib\docs\latex\ogl
erase /Y src\mingegcs.bat
erase /Y distrib

2
samples/stc/makefile.vc
View File

@ -7,7 +7,7 @@ WXDIR = $(WXWIN)
PROGRAM = stctest
OBJECTS = $(PROGRAM).obj
EXTRALIBS = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib
EXTRALIBS = $(WXDIR)\lib\stc$(LIBEXT).lib
EXTRAINC = -I$(WXDIR)\contrib\include
!include $(WXDIR)\src\makeprog.vc

4
src/stc/makefile.vc
View File

@ -47,9 +47,7 @@ OBJECTS = \
$(D)\stc.obj \
LIBTARGET = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib
LIBTARGET = $(WXDIR)\lib\stc$(LIBEXT).lib
all: $(D) $(LIBTARGET)