regenerated makefiles after fixing files.bkl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
@@ -2335,13 +2335,13 @@ HTMLLIB_OBJECTS = &
|
||||
$(OBJS)\htmllib_m_tables.obj &
|
||||
$(OBJS)\htmllib_winpars.obj &
|
||||
$(OBJS)\htmllib_htmllbox.obj
|
||||
MAKEARGS = CPPFLAGS=$(CPPFLAGS) OFFICIAL_BUILD=$(OFFICIAL_BUILD) &
|
||||
WXUNIV=$(WXUNIV) DEBUG_FLAG=$(DEBUG_FLAG) CFLAGS=$(CFLAGS) &
|
||||
RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) USE_GUI=$(USE_GUI) &
|
||||
MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) CC=$(CC) USE_HTML=$(USE_HTML) &
|
||||
BUILD=$(BUILD) LDFLAGS=$(LDFLAGS) DEBUG_INFO=$(DEBUG_INFO) SHARED=$(SHARED) &
|
||||
VENDOR=$(VENDOR) USE_OPENGL=$(USE_OPENGL) USE_ODBC=$(USE_ODBC) &
|
||||
UNICODE=$(UNICODE)
|
||||
MAKEARGS = CPPFLAGS="$(CPPFLAGS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
|
||||
WXUNIV="$(WXUNIV)" DEBUG_FLAG="$(DEBUG_FLAG)" CFLAGS="$(CFLAGS)" &
|
||||
RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" &
|
||||
USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" &
|
||||
CC="$(CC)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" LDFLAGS="$(LDFLAGS)" &
|
||||
DEBUG_INFO="$(DEBUG_INFO)" SHARED="$(SHARED)" VENDOR="$(VENDOR)" &
|
||||
USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" UNICODE="$(UNICODE)"
|
||||
MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff &
|
||||
@@ -9413,7 +9413,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wa
|
||||
@%create $(OBJS)\advdll.lbc
|
||||
@%append $(OBJS)\advdll.lbc option quiet
|
||||
@%append $(OBJS)\advdll.lbc name $^@
|
||||
@%append $(OBJS)\advdll.lbc option incremental
|
||||
@%append $(OBJS)\advdll.lbc option caseexact
|
||||
@%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i
|
||||
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\advdll.lbc library %i
|
||||
@@ -9442,7 +9442,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(B
|
||||
@%create $(OBJS)\basedll.lbc
|
||||
@%append $(OBJS)\basedll.lbc option quiet
|
||||
@%append $(OBJS)\basedll.lbc name $^@
|
||||
@%append $(OBJS)\basedll.lbc option incremental
|
||||
@%append $(OBJS)\basedll.lbc option caseexact
|
||||
@%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
|
||||
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\basedll.lbc library %i
|
||||
@@ -9511,7 +9511,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_w
|
||||
@%create $(OBJS)\coredll.lbc
|
||||
@%append $(OBJS)\coredll.lbc option quiet
|
||||
@%append $(OBJS)\coredll.lbc name $^@
|
||||
@%append $(OBJS)\coredll.lbc option incremental
|
||||
@%append $(OBJS)\coredll.lbc option caseexact
|
||||
@%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i
|
||||
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i
|
||||
@@ -9542,7 +9542,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid
|
||||
@%create $(OBJS)\dbgriddll.lbc
|
||||
@%append $(OBJS)\dbgriddll.lbc option quiet
|
||||
@%append $(OBJS)\dbgriddll.lbc name $^@
|
||||
@%append $(OBJS)\dbgriddll.lbc option incremental
|
||||
@%append $(OBJS)\dbgriddll.lbc option caseexact
|
||||
@%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i
|
||||
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\dbgriddll.lbc library %i
|
||||
@@ -9575,7 +9575,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat
|
||||
@%create $(OBJS)\gldll.lbc
|
||||
@%append $(OBJS)\gldll.lbc option quiet
|
||||
@%append $(OBJS)\gldll.lbc name $^@
|
||||
@%append $(OBJS)\gldll.lbc option incremental
|
||||
@%append $(OBJS)\gldll.lbc option caseexact
|
||||
@%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i
|
||||
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i
|
||||
@@ -9605,7 +9605,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_w
|
||||
@%create $(OBJS)\htmldll.lbc
|
||||
@%append $(OBJS)\htmldll.lbc option quiet
|
||||
@%append $(OBJS)\htmldll.lbc name $^@
|
||||
@%append $(OBJS)\htmldll.lbc option incremental
|
||||
@%append $(OBJS)\htmldll.lbc option caseexact
|
||||
@%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i
|
||||
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i
|
||||
@@ -9646,7 +9646,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V
|
||||
@%create $(OBJS)\monodll.lbc
|
||||
@%append $(OBJS)\monodll.lbc option quiet
|
||||
@%append $(OBJS)\monodll.lbc name $^@
|
||||
@%append $(OBJS)\monodll.lbc option incremental
|
||||
@%append $(OBJS)\monodll.lbc option caseexact
|
||||
@%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
|
||||
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\monodll.lbc library %i
|
||||
@@ -9672,7 +9672,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll :
|
||||
@%create $(OBJS)\netdll.lbc
|
||||
@%append $(OBJS)\netdll.lbc option quiet
|
||||
@%append $(OBJS)\netdll.lbc name $^@
|
||||
@%append $(OBJS)\netdll.lbc option incremental
|
||||
@%append $(OBJS)\netdll.lbc option caseexact
|
||||
@%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
|
||||
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i
|
||||
@@ -9699,7 +9699,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll :
|
||||
@%create $(OBJS)\odbcdll.lbc
|
||||
@%append $(OBJS)\odbcdll.lbc option quiet
|
||||
@%append $(OBJS)\odbcdll.lbc name $^@
|
||||
@%append $(OBJS)\odbcdll.lbc option incremental
|
||||
@%append $(OBJS)\odbcdll.lbc option caseexact
|
||||
@%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i
|
||||
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %i
|
||||
@@ -9774,7 +9774,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll :
|
||||
@%create $(OBJS)\xmldll.lbc
|
||||
@%append $(OBJS)\xmldll.lbc option quiet
|
||||
@%append $(OBJS)\xmldll.lbc name $^@
|
||||
@%append $(OBJS)\xmldll.lbc option incremental
|
||||
@%append $(OBJS)\xmldll.lbc option caseexact
|
||||
@%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
|
||||
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i
|
||||
|
||||
Reference in New Issue
Block a user