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

Added BCC include dir in XRC makefile

Browse Source 
Typo correction in app.tex


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-06-01 12:26:34 +00:00
parent 1e3d20528d
commit c1f7ecdf3b
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/xrc/makefile.b32
View File

@@ -13,7 +13,7 @@ expat_dir = $(WXDIR)\contrib\src\xrc\expat
XMLPARSEDIR = $(expat_dir)\xmlparse XMLPARSEDIR = $(expat_dir)\xmlparse
XMLTOKDIR = $(expat_dir)\xmltok XMLTOKDIR = $(expat_dir)\xmltok
EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok -I$(BCCDIR)\include
EXPAT_OBJECTS=xmltok.obj xmlrole.obj xmlparse.obj EXPAT_OBJECTS=xmltok.obj xmlrole.obj xmlparse.obj
EXTRACPPFLAGS=$(wxLIBXMLDIR) $(EXPAT_DEFS) EXTRACPPFLAGS=$(wxLIBXMLDIR) $(EXPAT_DEFS)

6
distrib/msw/makeinno.bat
View File

@@ -30,11 +30,15 @@ echo [Dirs] >> %temp\files2.tmp
do i = 0 to %len by 1 do i = 0 to %len by 1
set line=%@LINE[%TEMP\files1.tmp,%i] set line=%@LINE[%TEMP\files1.tmp,%i]
Rem echo line is %line
Rem Skip files. Rem Skip files.
if not isdir %line enddo if not isdir %line enddo
set sz2=%@LEN[%line] set sz2=%@LEN[%line]
Rem echo size is %sz2
set n=%@EVAL[%sz2-%sz] set n=%@EVAL[%sz2-%sz]
Rem echo n is %sz2
set line2=%@SUBSTR[%line,%sz,%n] set line2=%@SUBSTR[%line,%sz,%n]
Rem echo line2 is %line2
if "%line2%" == "" enddo if "%line2%" == "" enddo
echo Name: {app}\%line2 >> %TEMP\files2.tmp echo Name: {app}\%line2 >> %TEMP\files2.tmp
@@ -63,7 +67,7 @@ enddo
Rem Concatenate the 3 sections Rem Concatenate the 3 sections
cat %wxwindir\distrib\msw\innotop.txt %TEMP\files2.tmp %wxwindir\distrib\msw\innobott.txt > %wxwindir\distrib\msw\wxwin2.iss cat %wxwindir\distrib\msw\innotop.txt %TEMP\files2.tmp %wxwindir\distrib\msw\innobott.txt > %wxwindir\distrib\msw\wxwin2.iss
erase /Y %TEMP\files1.tmp rem erase /Y %TEMP\files1.tmp
rem erase /Y %TEMP\files2.tmp rem erase /Y %TEMP\files2.tmp
goto end goto end

2
docs/latex/wx/app.tex
View File

@@ -130,7 +130,7 @@ manner to refer to the application.
\membersection{wxApp::GetExitOnFrameDelete}\label{wxappgetexitonframedelete} \membersection{wxApp::GetExitOnFrameDelete}\label{wxappgetexitonframedelete}
\constfunc{bool}{GetExitFrameOnDelete}{\void} \constfunc{bool}{GetExitOnFrameDelete}{\void}
Returns TRUE if the application will exit when the top-level window is deleted, FALSE Returns TRUE if the application will exit when the top-level window is deleted, FALSE
otherwise. otherwise.

2
docs/latex/wx/wx.hpj
View File

@@ -1,5 +1,5 @@
[OPTIONS] [OPTIONS]
BMROOT=c:\wx24\wxwind~1\docs/latex/wx ; Assume that bitmaps are where the source is BMROOT=c:\wx24\wxWind~1\docs\latex\wx
TITLE=wxWindows Manual TITLE=wxWindows Manual
CONTENTS=Contents CONTENTS=Contents
COMPRESS=HIGH COMPRESS=HIGH

4
include/wx/msw/setup0.h
View File

@@ -885,7 +885,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Define 1 to use ODBC classes // Define 1 to use ODBC classes
#define wxUSE_ODBC 0 #define wxUSE_ODBC 1
// For backward compatibility reasons, this parameter now only controls the // For backward compatibility reasons, this parameter now only controls the
// default scrolling method used by cursors. This default behavior can be // default scrolling method used by cursors. This default behavior can be
@@ -921,7 +921,7 @@
// Default is 1. // Default is 1.
// //
// Recommended setting: whatever your compiler likes more // Recommended setting: whatever your compiler likes more
#define wxUSE_IOSTREAMH 1 #define wxUSE_IOSTREAMH 0
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// image format support // image format support

8
samples/makefile.vc
View File

@@ -92,10 +92,10 @@ all:
nmake -f makefile.vc $(MAKEFLAGS) nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\menu cd $(WXDIR)\samples\menu
nmake -f makefile.vc $(MAKEFLAGS) nmake -f makefile.vc $(MAKEFLAGS)
!if "$(FINAL)" == "0" #!if "$(FINAL)" == "0"
cd $(WXDIR)\samples\memcheck # cd $(WXDIR)\samples\memcheck
nmake -f makefile.vc $(MAKEFLAGS) # nmake -f makefile.vc $(MAKEFLAGS)
!endif #!endif
!if "$(COMPIL)"=="" !if "$(COMPIL)"==""
cd $(WXDIR)\samples\mfc cd $(WXDIR)\samples\mfc
nmake -f makefile.vc $(MAKEFLAGS) nmake -f makefile.vc $(MAKEFLAGS)

2
src/xrc/makefile.b32
View File

@@ -13,7 +13,7 @@ expat_dir = $(WXDIR)\contrib\src\xrc\expat
XMLPARSEDIR = $(expat_dir)\xmlparse XMLPARSEDIR = $(expat_dir)\xmlparse
XMLTOKDIR = $(expat_dir)\xmltok XMLTOKDIR = $(expat_dir)\xmltok
EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok -I$(BCCDIR)\include
EXPAT_OBJECTS=xmltok.obj xmlrole.obj xmlparse.obj EXPAT_OBJECTS=xmltok.obj xmlrole.obj xmlparse.obj
EXTRACPPFLAGS=$(wxLIBXMLDIR) $(EXPAT_DEFS) EXTRACPPFLAGS=$(wxLIBXMLDIR) $(EXPAT_DEFS)