Restored sane way of using BC++ linker
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -47,7 +47,7 @@ WXLIB= $(WXLIBDIR)\wx200.lib
|
|||||||
|
|
||||||
!else
|
!else
|
||||||
|
|
||||||
LINK_FLAGS= /Tpe /ap /c
|
LINK_FLAGS= /aa /c
|
||||||
|
|
||||||
!if "$(WXUSINGDLL)" == "1"
|
!if "$(WXUSINGDLL)" == "1"
|
||||||
DLL_FLAGS= -DWXUSINGDLL=1
|
DLL_FLAGS= -DWXUSINGDLL=1
|
||||||
@@ -61,7 +61,7 @@ WXLIB= $(WXLIBDIR)\wx32.lib
|
|||||||
|
|
||||||
!if "$(WXBUILDDLL)" == "1"
|
!if "$(WXBUILDDLL)" == "1"
|
||||||
DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
|
DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
|
||||||
LINK_FLAGS= /Tpd /ap /c $(EXTRALINKFLAGS)
|
LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
|
CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
|
||||||
|
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
# If using Cygwin, set this to 0.
|
# If using Cygwin, set this to 0.
|
||||||
# If using Mingw32, set this to 1.
|
# If using Mingw32, set this to 1.
|
||||||
MINGW32=0
|
MINGW32=1
|
||||||
|
|
||||||
# Set to the version you have
|
# Set to the version you have
|
||||||
MINGW32VERSION=2.95
|
MINGW32VERSION=2.95
|
||||||
|
@@ -20,12 +20,12 @@ LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odb
|
|||||||
|
|
||||||
!if "$(FINAL)" == "0"
|
!if "$(FINAL)" == "0"
|
||||||
#LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)
|
#LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)
|
||||||
LINKFLAGS=/v /c /Tpe -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
|
LINKFLAGS=/v /c /aa -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
|
||||||
OPT = -Od
|
OPT = -Od
|
||||||
DEBUG_FLAGS= -v
|
DEBUG_FLAGS= -v
|
||||||
!else
|
!else
|
||||||
#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
|
#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
|
||||||
LINKFLAGS=/Tpe -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
|
LINKFLAGS=/aa -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
|
||||||
OPT = -Od
|
OPT = -Od
|
||||||
DEBUG_FLAGS =
|
DEBUG_FLAGS =
|
||||||
!endif
|
!endif
|
||||||
|
Reference in New Issue
Block a user