regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
|
||||
$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
HELPVIEW_OBJECTS = \
|
||||
$(__helpview_os2_lib_res) \
|
||||
helpview_helpview.o \
|
||||
@@ -78,8 +77,8 @@ WX_VERSION = 2.5.1
|
||||
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
|
||||
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o helpview$(EXEEXT) Carbon.r \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
|
||||
$(srcdir)/../../../samples -o helpview$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
|
||||
@@ -162,7 +161,7 @@ helpview_helpview.o: $(srcdir)/helpview.cpp
|
||||
$(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $<
|
||||
|
||||
helpview_helpview_rc.o: $(srcdir)/helpview.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
|
||||
|
||||
install: all
|
||||
|
||||
|
@@ -4,7 +4,12 @@
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
.autodepend
|
||||
|
||||
!ifndef BCCDIR
|
||||
!ifndef MAKEDIR
|
||||
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
|
||||
!endif
|
||||
BCCDIR = $(MAKEDIR)\..
|
||||
!endif
|
||||
|
||||
@@ -14,16 +19,13 @@ BCCDIR = $(MAKEDIR)\..
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
!if "$(BCCDIR)" == "\.."
|
||||
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
|
||||
!endif
|
||||
|
||||
### Variables: ###
|
||||
|
||||
HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \
|
||||
$(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
HELPVIEW_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
|
||||
-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS)
|
||||
-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
HELPVIEW_OBJECTS = \
|
||||
$(OBJS)\helpview_helpview.obj
|
||||
OBJS = \
|
||||
@@ -178,6 +180,6 @@ data:
|
||||
for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
||||
|
||||
$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
|
||||
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\helpview_helpview.res
|
||||
|
|
||||
|
@@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc
|
||||
|
||||
### Variables: ###
|
||||
|
||||
HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
|
||||
HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \
|
||||
$(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \
|
||||
$(__EXCEPTIONSFLAG_5)
|
||||
$(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \
|
||||
$(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
|
||||
HELPVIEW_OBJECTS = \
|
||||
$(OBJS)\helpview_helpview.o \
|
||||
$(OBJS)\helpview_helpview_rc.o
|
||||
|
@@ -12,12 +12,12 @@
|
||||
|
||||
### Variables: ###
|
||||
|
||||
HELPVIEW_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
|
||||
/DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_2_p) \
|
||||
HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
|
||||
$(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_2_p) \
|
||||
$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \
|
||||
/I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \
|
||||
$(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9)
|
||||
$(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS)
|
||||
HELPVIEW_OBJECTS = \
|
||||
$(OBJS)\helpview_helpview.obj \
|
||||
$(OBJS)\helpview_helpview.res
|
||||
|
@@ -172,10 +172,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
|
||||
|
||||
### Variables: ###
|
||||
|
||||
HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
|
||||
HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
|
||||
$(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. &
|
||||
$(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7)
|
||||
$(__DLLFLAG_p) -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) &
|
||||
$(CXXFLAGS)
|
||||
HELPVIEW_OBJECTS = &
|
||||
$(OBJS)\helpview_helpview.obj
|
||||
OBJS = &
|
||||
|
Reference in New Issue
Block a user