From 35820dcb473549706bef2e59cf1b3cfa11d8d313 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 17 Jun 2001 18:34:20 +0000 Subject: [PATCH] Makefile and other small corrections git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/stc/makefile.vc | 2 +- contrib/src/stc/makefile.vc | 4 +--- distrib/msw/contrib.rsp | 15 +++++++++++++++ distrib/msw/makefile.rsp | 1 + distrib/msw/xml.rsp | 5 ++--- distrib/msw/zipdistinno.bat | 14 +++++++++----- samples/stc/makefile.vc | 2 +- src/stc/makefile.vc | 4 +--- 8 files changed, 31 insertions(+), 16 deletions(-) diff --git a/contrib/samples/stc/makefile.vc b/contrib/samples/stc/makefile.vc index 956b781364..4ab23679ef 100644 --- a/contrib/samples/stc/makefile.vc +++ b/contrib/samples/stc/makefile.vc @@ -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 diff --git a/contrib/src/stc/makefile.vc b/contrib/src/stc/makefile.vc index c101bba3f1..b8fce0a183 100644 --- a/contrib/src/stc/makefile.vc +++ b/contrib/src/stc/makefile.vc @@ -47,9 +47,7 @@ OBJECTS = \ $(D)\stc.obj \ - - -LIBTARGET = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib +LIBTARGET = $(WXDIR)\lib\stc$(LIBEXT).lib all: $(D) $(LIBTARGET) diff --git a/distrib/msw/contrib.rsp b/distrib/msw/contrib.rsp index 870b1408d9..74ecbe1fe9 100644 --- a/distrib/msw/contrib.rsp +++ b/distrib/msw/contrib.rsp @@ -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 diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index 95f970037b..77c5173d82 100644 --- a/distrib/msw/makefile.rsp +++ b/distrib/msw/makefile.rsp @@ -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 diff --git a/distrib/msw/xml.rsp b/distrib/msw/xml.rsp index cdb2d3f53e..367f1616a1 100644 --- a/distrib/msw/xml.rsp +++ b/distrib/msw/xml.rsp @@ -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 diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat index e16eaf838c..197ca84ae7 100755 --- a/distrib/msw/zipdistinno.bat +++ b/distrib/msw/zipdistinno.bat @@ -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 diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc index 956b781364..4ab23679ef 100644 --- a/samples/stc/makefile.vc +++ b/samples/stc/makefile.vc @@ -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 diff --git a/src/stc/makefile.vc b/src/stc/makefile.vc index c101bba3f1..b8fce0a183 100644 --- a/src/stc/makefile.vc +++ b/src/stc/makefile.vc @@ -47,9 +47,7 @@ OBJECTS = \ $(D)\stc.obj \ - - -LIBTARGET = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib +LIBTARGET = $(WXDIR)\lib\stc$(LIBEXT).lib all: $(D) $(LIBTARGET) -- 2.47.2