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

Win16 BC++ makefile fixes, other v. small fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-20 16:32:55 +00:00
parent 05edc41991
commit f47cd02d71
13 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/msw/generic.rsp
View File

@@ -50,7 +50,7 @@ docs/gpl.txt
docs/lgpl.txt
docs/symbols.txt
docs/bugs.txt
docs/*.htm
docs/index.htm
docs/html/*.htm
docs/html/*.gif
docs/html/*.png

1
distrib/msw/msw.rsp
View File

@@ -82,6 +82,7 @@ include/wx/msw/*.rc
include/wx/msw/ctl3d/*.h
include/wx/msw/gnuwin32/*.h
include/wx/msw/gnuwin32/*.def
include/wx/msw/gnuwin32/gl/*.h
include/wx/msw/ole/*.h
include/wx/msw/*.cur
include/wx/msw/*.ico

7
distrib/msw/tmake/bcc.t
View File

@@ -20,7 +20,10 @@
#! now transform these hashes into $project tags
foreach $file (sort keys %wxGeneric) {
my $tag = "";
next if $wxGeneric{$file} =~ /\b(PS|G|U)\b/;
if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
#! Need this file too since it has wxGenericPageSetupDialog
next unless $file =~ /^prntdlgg\./;
}
$file =~ s/cp?p?$/obj/;
$project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
@@ -106,7 +109,7 @@ PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
!endif
!if "$(USE_XPM_IN_MSW)" == "1"
PERIPH_LIBS=$(WXDIR)\xpm.lib $(PERIPH_LIBS)
PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
PERIPH_TARGET=xpm $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
!endif

2
distrib/msw/tmake/dos.t
View File

@@ -14,7 +14,7 @@
#! now transform these hashes into $project tags
foreach $file (sort keys %wxGeneric) {
if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
#! this file for some reason wasn't compiled for VC++ 1.52
#! Need this file too since it has wxGenericPageSetupDialog
next unless $file =~ /^prntdlgg\./;
}

19
distrib/msw/wisebott.txt
View File

@@ -63,12 +63,17 @@ end
item: Create Shortcut
Source=%MAINDIR%\bin\dialoged.exe
Destination=%GROUP%\Dialog Editor.lnk
Working Directory=%MAINDIR%
Working Directory=%MAINDIR%\bin
end
item: Create Shortcut
Source=%MAINDIR%\bin\tex2rtf.exe
Destination=%GROUP%\Tex2RTF.lnk
Working Directory=%MAINDIR%\bin
end
item: Create Shortcut
Source=%MAINDIR%\bin\dbgview.exe
Destination=%GROUP%\DebugView.lnk
Working Directory=%MAINDIR%
Working Directory=%MAINDIR%\bin
end
item: Create Shortcut
Source=%MAINDIR%\bin\life.exe
@@ -129,7 +134,13 @@ item: Add ProgMan Icon
Group=%GROUP%
Icon Name=Dialog Editor
Command Line=%MAINDIR%\bin\dialoged.exe
Default Directory=%MAINDIR%
Default Directory=%MAINDIR%\bin
end
item: Add ProgMan Icon
Group=%GROUP%
Icon Name=Tex2RTF
Command Line=%MAINDIR%\bin\tex2rtf.exe
Default Directory=%MAINDIR%\bin
end
item: Add ProgMan Icon
Group=%GROUP%
@@ -141,7 +152,7 @@ item: Add ProgMan Icon
Group=%GROUP%
Icon Name=Life! Demo
Command Line=%MAINDIR%\bin\life.exe
Default Directory=%MAINDIR%
Default Directory=%MAINDIR%\bin
end
item: End Block
end

7
distrib/msw/wx_html.rsp
View File

@@ -14,3 +14,10 @@ docs/html/odbc/*.htm
docs/html/gettext/*.htm
contrib/docs/html/ogl/*.htm
contrib/docs/html/ogl/*.gif
contrib/docs/html/mmedia/*.htm
contrib/docs/html/mmedia/*.gif
contrib/docs/html/stc/*.htm
contrib/docs/html/stc/*.gif

1
distrib/msw/wx_pdf.rsp
View File

@@ -1 +1,2 @@
docs/pdf/*.pdf
contrib/docs/pdf/*.pdf

15
distrib/msw/zipdist.bat
View File

@@ -28,6 +28,7 @@ erase %dest\jpeg.zip
erase %dest\tiff.zip
erase %dest\dialoged.zip
erase %dest\utils.zip
erase %dest\extradoc.zip
if direxist %dest\wx deltree /Y %dest\wx
@@ -51,6 +52,10 @@ zip32 -@ %dest\wx%version%_htm.zip < %src\distrib\msw\wx_html.rsp
zip32 -@ %dest\wx%version%_pdf.zip < %src\distrib\msw\wx_pdf.rsp
zip32 -@ %dest\wx%version%_wrd.zip < %src\distrib\msw\wx_word.rsp
Rem PDF/HTML docs that should go into the Windows setup because
Rem there are no WinHelp equivalents
zip32 -@ %dest\extradoc.zip < %src\distrib\msw\extradoc.rsp
rem VC++ project files
zip32 -@ %dest\wx%version%_vc.zip < %src\distrib\msw\vc.rsp
@@ -119,6 +124,7 @@ unzip32 -o ..\wx%version%_gen.zip
unzip32 -o ..\wx%version%_vc.zip
unzip32 -o ..\wx%version%_bc.zip
unzip32 -o ..\wx%version%_hlp.zip
unzip32 -o ..\extradoc.zip
Rem Need Word file, for Remstar DB classes
unzip32 -o ..\wx%version%_wrd.zip
unzip32 -o ..\ogl3.zip
@@ -132,15 +138,20 @@ erase /Y BuildCVS.txt *.in *.spec *.guess *.sub mkinstalldirs modules install-sh
erase /Y configure samples\configure samples\*.in demos\configure demos\*.in contrib\configure contrib\*.in
erase /Y setup.h.in setup.h_vms
erase /SY Makefile.in
rem erase /Y docs\pdf\ogl.pdf
rem deltree /Y docs\html\ogl
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\pdf\*.*
deltree /Y contrib\docs\latex\ogl
rem Now copy some binary files to 'bin'
if not isdir bin mkdir bin
copy %src\bin\dialoged.exe bin
copy %src\bin\tex2rtf.exe bin
copy %src\bin\dbgview.* bin
copy %src\bin\life.exe bin
copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin
rem Time to regenerate the WISE install script, wxwin2.wse.
rem NB: if you've changed wxwin2.wse using WISE, call splitwise.exe

7
docs/html/index.htm
View File

@@ -137,6 +137,13 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
<ul>
<li><a href="../tech/index.txt">Index of technical notes</a>
<li><a href="../tech/">Technical notes</a> in text form
<li>Other documents:
<ul>
<li><a href="platform.htm">Platforms supported</a>
<li><a href="i18n.htm">Languages supported by wxWindows</a>
<li><a href="standard.htm">wxWindows programmer style guide</a>
<li><a href="news.htm">wxWindows news</a>
</ul>
</ul>
<h3 align=center><a name="thirdparty"><hr>Third-party tools<hr></a></h3>

2
samples/docview/makefile.bcc
View File

@@ -13,7 +13,7 @@
WXDIR = $(WXWIN)
TARGET=docview
OBJECTS=$(TARGET).obj
OBJECTS=$(TARGET).obj doc.obj view.obj
!include $(WXDIR)\src\makeprog.bcc

2
samples/docvwmdi/makefile.bcc
View File

@@ -13,7 +13,7 @@
WXDIR = $(WXWIN)
TARGET=docview
OBJECTS=$(TARGET).obj
OBJECTS=$(TARGET).obj doc.obj view.obj
!include $(WXDIR)\src\makeprog.bcc

1
src/msw/enhmeta.cpp
View File

@@ -170,6 +170,7 @@ bool wxEnhMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));
#else // !wxUSE_DRAG_AND_DROP
wxFAIL_MSG(_T("not implemented"));
return FALSE;
#endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP
}

7
src/msw/makefile.bcc
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 15:55, 2000/03/14
# This file was automatically generated by tmake at 16:08, 2000/03/20
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
#
@@ -88,6 +88,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
$(MSWDIR)\numdlgg.obj \
$(MSWDIR)\panelg.obj \
$(MSWDIR)\plot.obj \
$(MSWDIR)\prntdlgg.obj \
$(MSWDIR)\progdlgg.obj \
$(MSWDIR)\prop.obj \
$(MSWDIR)\propform.obj \
@@ -676,6 +677,8 @@ $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
$(MSWDIR)\plot.obj: $(GENDIR)\plot.$(SRCSUFF)
$(MSWDIR)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF)
$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
@@ -706,6 +709,8 @@ $(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
$(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
all_utils:
cd $(WXDIR)\utils
make -f makefile.bcc