Changes to the BC makefiles as proposed by Christoph Schulz.
The problem was: === Cut === Unfortunately, now you cannot build a wxWin program using both static wxWin library and static RTL (because _RTLDLL is now always defined). === Cut === This is fixed now: === Cut === Now, if you build/use wxWin as a DLL (WXMAKINGDLL=1/WXUSINGDLL=1) the dynamic RTL (c?mt32??.dll) is used, otherwise the static library. === Cut === git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -360,7 +360,6 @@ $(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__
|
||||||
|
@@ -13,7 +13,11 @@
|
|||||||
WXDIR = $(WXWIN)
|
WXDIR = $(WXWIN)
|
||||||
!include $(WXDIR)\src\makeb32.env
|
!include $(WXDIR)\src\makeb32.env
|
||||||
|
|
||||||
|
!if "$(WXUSINGDLL)" == "1"
|
||||||
LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
|
LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
|
||||||
|
!else
|
||||||
|
LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
|
||||||
|
!endif
|
||||||
|
|
||||||
# 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
|
||||||
@@ -30,7 +34,7 @@ OPT = -Od
|
|||||||
DEBUG_FLAGS =
|
DEBUG_FLAGS =
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
CPPFLAGS=$(CPP_FLAGS) $(EXTRACPPFLAGS) $(DEBUG_FLAGS) $(DLL_FLAGS) $(OPT) @$(CFG)
|
CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT)
|
||||||
|
|
||||||
all: $(TARGET).exe $(EXTRATARGETS)
|
all: $(TARGET).exe $(EXTRATARGETS)
|
||||||
|
|
||||||
|
@@ -28,8 +28,8 @@ THISDIR = $(WXDIR)\src\msw
|
|||||||
|
|
||||||
# Set all these to 1 if you want to build a dynamic library
|
# Set all these to 1 if you want to build a dynamic library
|
||||||
!if "$(DLL)" == "1"
|
!if "$(DLL)" == "1"
|
||||||
WXMAKINGDLL=1
|
WXMAKINGDLL=0
|
||||||
WXBUILDDLL=1
|
WXBUILDDLL=0
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
!include $(WXDIR)\src\makeb32.env
|
!include $(WXDIR)\src\makeb32.env
|
||||||
@@ -992,7 +992,6 @@ $(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__
|
||||||
|
Reference in New Issue
Block a user