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

Further BC++ patches

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-06-21 07:07:36 +00:00
parent 86d60447c3
commit 7e5510c0ad
6 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/msw/tmake/b32.t
View File

@@ -126,7 +126,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA
DUMMY=dummy DUMMY=dummy
!else !else
DUMMY=dummydll DUMMY=dummydll
LIBS= cw32mt import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff LIBS= cw32mti import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
!endif !endif
LIBTARGET=$(WXLIB) LIBTARGET=$(WXLIB)
@@ -343,6 +343,7 @@ clean_tiff:
$(CFG): makefile.b32 $(CFG): makefile.b32
copy &&! copy &&!
-Hc
-H=$(WXDIR)\src\msw\wx32.csm -H=$(WXDIR)\src\msw\wx32.csm
-3 -3
-d -d
@@ -359,6 +360,7 @@ $(CFG): makefile.b32
-I$(WXDIR)\include\wx\msw\gnuwin32 -I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
-D_RTLDLL
-D__WXWIN__ -D__WXWIN__
-D__WXMSW__ -D__WXMSW__
-D__WINDOWS__ -D__WINDOWS__

10
docs/msw/install.txt
View File

@@ -69,7 +69,8 @@ Visual C++ 4.0/5.0/6.0 compilation
Using project files (VC++ 5 and 6 only): Using project files (VC++ 5 and 6 only):
1. Unarchive wx2_x_y_vc.zip, the VC++ 5/6 project makefiles. 1. Unarchive wxWindows-x.y.z-vc.zip, the VC++ 5/6 project
makefiles (already included in wxMSW-x.y.z.zip and the setup version).
2. Open src/wxvc.dsp, set Debug or Release configuration for 2. Open src/wxvc.dsp, set Debug or Release configuration for
the wxvc project, and compile. Alternatively, use Batch Build the wxvc project, and compile. Alternatively, use Batch Build
to build both Debug and Release configurations. to build both Debug and Release configurations.
@@ -228,6 +229,13 @@ Compiling using the makefiles:
'make -f makefile.b32 clean' 'make -f makefile.b32 clean'
'make -f makefile.b32 FINAL=1' 'make -f makefile.b32 FINAL=1'
for the library and samples. for the library and samples.
5. To make and use wxWindows as a DLL, type
'make -f makefile.b32 clean'
'make -f makefile.b32 DLL=1'
and then for each sample,
'make -f makefile.b32 WXUSINGDLL=1'
Unfortunately there are still undiagnosed run-time problems
with this configuration.
Note (1): the wxWindows library and (some) samples compile in 16-bit mode Note (1): the wxWindows library and (some) samples compile in 16-bit mode
using makefile.bcc, but at present the wxWindows resource system is switched using makefile.bcc, but at present the wxWindows resource system is switched

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

@@ -733,6 +733,12 @@
#define wxUSE_MS_HTML_HELP 0 #define wxUSE_MS_HTML_HELP 0
#endif #endif
// wxUSE_DBEUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode
#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
#undef wxUSE_DBEUG_NEW_ALWAYS
#define wxUSE_DBEUG_NEW_ALWAYS 0
#endif
#if defined(__WXMSW__) && defined(__WATCOMC__) #if defined(__WXMSW__) && defined(__WATCOMC__)
#undef wxUSE_LIBJPEG #undef wxUSE_LIBJPEG
#define wxUSE_LIBJPEG 0 #define wxUSE_LIBJPEG 0

4
src/makeb32.env
View File

@@ -42,7 +42,7 @@ DLL=0
# #
!if "$(WXMAKINGDLL)" == "1" !if "$(WXMAKINGDLL)" == "1"
DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL DLL_FLAGS= -DWXMAKINGDLL=1 # -D_WINDLL
WXLIB= $(WXLIBDIR)\wx200.lib WXLIB= $(WXLIBDIR)\wx200.lib
!else !else
@@ -60,7 +60,7 @@ WXLIB= $(WXLIBDIR)\wx32.lib
!endif !endif
!if "$(WXBUILDDLL)" == "1" !if "$(WXBUILDDLL)" == "1"
DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL DLL_FLAGS= $(DLL_FLAGS) # -D_RTLDLL
LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS) LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
!endif !endif

2
src/makeprog.b32
View File

@@ -13,7 +13,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
!include $(WXDIR)\src\makeb32.env !include $(WXDIR)\src\makeb32.env
LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32 LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
# Note: you may need to remove some libraries for earlier versions of BC++, as below # Note: you may need to remove some libraries for earlier versions of BC++, as below
#LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib xpm tiff #LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib xpm tiff

4
src/msw/makefile.b32
View File

@@ -65,7 +65,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA
DUMMY=dummy DUMMY=dummy
!else !else
DUMMY=dummydll DUMMY=dummydll
LIBS= cw32mt import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff LIBS= cw32mti import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
!endif !endif
LIBTARGET=$(WXLIB) LIBTARGET=$(WXLIB)
@@ -975,6 +975,7 @@ clean_tiff:
$(CFG): makefile.b32 $(CFG): makefile.b32
copy &&! copy &&!
-Hc
-H=$(WXDIR)\src\msw\wx32.csm -H=$(WXDIR)\src\msw\wx32.csm
-3 -3
-d -d
@@ -991,6 +992,7 @@ $(CFG): makefile.b32
-I$(WXDIR)\include\wx\msw\gnuwin32 -I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
-D_RTLDLL
-D__WXWIN__ -D__WXWIN__
-D__WXMSW__ -D__WXMSW__
-D__WINDOWS__ -D__WINDOWS__