regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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,17 +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: ###
|
||||
|
||||
FLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
|
||||
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \
|
||||
-I$(SETUPHDIR) -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL \
|
||||
$(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_fldll.csm
|
||||
FLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) \
|
||||
-I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL -Hu \
|
||||
-H=$(OBJS)\wxprec_fldll.csm $(CPPFLAGS) $(CXXFLAGS)
|
||||
FLDLL_OBJECTS = \
|
||||
$(OBJS)\fldll_dummy.obj \
|
||||
$(OBJS)\fldll_antiflickpl.obj \
|
||||
@@ -44,11 +45,11 @@ FLDLL_OBJECTS = \
|
||||
$(OBJS)\fldll_rowlayoutpl.obj \
|
||||
$(OBJS)\fldll_toolwnd.obj \
|
||||
$(OBJS)\fldll_updatesmgr.obj
|
||||
FLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
|
||||
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \
|
||||
-I$(SETUPHDIR) -I..\..\src\fl\..\..\include $(CXXFLAGS) -Hu \
|
||||
-H=$(OBJS)\wxprec_fllib.csm
|
||||
FLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) \
|
||||
-I..\..\src\fl\..\..\include -Hu -H=$(OBJS)\wxprec_fllib.csm $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
FLLIB_OBJECTS = \
|
||||
$(OBJS)\fllib_dummy.obj \
|
||||
$(OBJS)\fllib_antiflickpl.obj \
|
||||
@@ -313,7 +314,7 @@ clean:
|
||||
|
||||
!if "$(SHARED)" == "1"
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(FLDLL_OBJECTS)
|
||||
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
|
||||
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
|
||||
c0d32.obj $(FLDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
|
||||
|
|
||||
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@
|
||||
@@ -322,7 +323,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc
|
||||
!if "$(SHARED)" == "0"
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj $(FLLIB_OBJECTS)
|
||||
if exist $@ del $@
|
||||
tlib /a /p2048 $@ @&&|
|
||||
tlib /a /p4096 $@ @&&|
|
||||
$(FLLIB_OBJECTS)
|
||||
|
|
||||
!endif
|
||||
|
@@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc
|
||||
|
||||
### Variables: ###
|
||||
|
||||
FLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) \
|
||||
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)
|
||||
FLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
|
||||
-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
-I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL \
|
||||
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
|
||||
FLDLL_OBJECTS = \
|
||||
$(OBJS)\fldll_dummy.o \
|
||||
$(OBJS)\fldll_antiflickpl.o \
|
||||
@@ -36,11 +36,11 @@ FLDLL_OBJECTS = \
|
||||
$(OBJS)\fldll_rowlayoutpl.o \
|
||||
$(OBJS)\fldll_toolwnd.o \
|
||||
$(OBJS)\fldll_updatesmgr.o
|
||||
FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\fl\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
|
||||
$(__EXCEPTIONSFLAG_0)
|
||||
FLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
|
||||
-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
-I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\fl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
FLLIB_OBJECTS = \
|
||||
$(OBJS)\fllib_dummy.o \
|
||||
$(OBJS)\fllib_antiflickpl.o \
|
||||
|
@@ -12,15 +12,15 @@
|
||||
|
||||
### Variables: ###
|
||||
|
||||
FLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
|
||||
FLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
|
||||
$(__DEBUGINFO_2) \
|
||||
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).pdb \
|
||||
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
|
||||
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
/I..\..\src\fl\..\..\..\include /I$(SETUPHDIR) /W4 \
|
||||
/I..\..\src\fl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FL $(CXXFLAGS) \
|
||||
/I..\..\src\fl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FL \
|
||||
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \
|
||||
/Fp"$(OBJS)\wxprec_fldll.pch"
|
||||
/Fp"$(OBJS)\wxprec_fldll.pch" $(CPPFLAGS) $(CXXFLAGS)
|
||||
FLDLL_OBJECTS = \
|
||||
$(OBJS)\fldll_dummy.obj \
|
||||
$(OBJS)\fldll_antiflickpl.obj \
|
||||
@@ -40,14 +40,14 @@ FLDLL_OBJECTS = \
|
||||
$(OBJS)\fldll_rowlayoutpl.obj \
|
||||
$(OBJS)\fldll_toolwnd.obj \
|
||||
$(OBJS)\fldll_updatesmgr.obj
|
||||
FLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \
|
||||
FLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \
|
||||
$(__DEBUGINFO_2) \
|
||||
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.pdb \
|
||||
$(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
|
||||
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
/I..\..\src\fl\..\..\..\include /I$(SETUPHDIR) /W4 \
|
||||
/I..\..\src\fl\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
|
||||
$(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fllib.pch"
|
||||
/I..\..\src\fl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
|
||||
/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fllib.pch" $(CPPFLAGS) $(CXXFLAGS)
|
||||
FLLIB_OBJECTS = \
|
||||
$(OBJS)\fllib_dummy.obj \
|
||||
$(OBJS)\fllib_antiflickpl.obj \
|
||||
|
@@ -180,11 +180,11 @@ __fllib___depname = &
|
||||
|
||||
### Variables: ###
|
||||
|
||||
FLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) &
|
||||
-i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL $(CXXFLAGS) &
|
||||
/fh=$(OBJS)\wxprec_fldll.pch $(__EXCEPTIONSFLAG)
|
||||
FLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
|
||||
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) &
|
||||
-i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL &
|
||||
/fh=$(OBJS)\wxprec_fldll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
FLDLL_OBJECTS = &
|
||||
$(OBJS)\fldll_dummy.obj &
|
||||
$(OBJS)\fldll_antiflickpl.obj &
|
||||
@@ -204,11 +204,11 @@ FLDLL_OBJECTS = &
|
||||
$(OBJS)\fldll_rowlayoutpl.obj &
|
||||
$(OBJS)\fldll_toolwnd.obj &
|
||||
$(OBJS)\fldll_updatesmgr.obj
|
||||
FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) &
|
||||
-i=..\..\src\fl\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_fllib.pch &
|
||||
$(__EXCEPTIONSFLAG)
|
||||
FLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
|
||||
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) &
|
||||
-i=..\..\src\fl\..\..\include /fh=$(OBJS)\wxprec_fllib.pch &
|
||||
$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
FLLIB_OBJECTS = &
|
||||
$(OBJS)\fllib_dummy.obj &
|
||||
$(OBJS)\fllib_antiflickpl.obj &
|
||||
@@ -378,5 +378,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib : $(FLLIB_OBJECTS)
|
||||
@%create $(OBJS)\fllib.lbc
|
||||
@for %i in ($(FLLIB_OBJECTS)) do @%append $(OBJS)\fllib.lbc +%i
|
||||
wlib -q -p2048 -n -b $^@ @$(OBJS)\fllib.lbc
|
||||
wlib -q -p4096 -n -b $^@ @$(OBJS)\fllib.lbc
|
||||
!endif
|
||||
|
Reference in New Issue
Block a user