regenerated makefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-24 10:23:35 +00:00
parent f284605f65
commit 1c3a6972f4
623 changed files with 5944 additions and 5908 deletions

View File

@@ -204,7 +204,7 @@ fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc)
$(__fl_demo1___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p fl_demo1.app/Contents
mkdir -p fl_demo1.app/Contents/MacOS
mkdir -p fl_demo1.app/Contents/Resources
@@ -225,7 +225,7 @@ fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo1.app/Contents/Resources/fl_demo1.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns fl_demo1.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@fl_demo1_bundle: fl_demo1.app/Contents
@COND_PLATFORM_MACOSX_1@fl_demo1_bundle: fl_demo1.app/Contents/PkgInfo
fl_demo1_fl_demo1.o: $(srcdir)/fl_demo1.cpp
$(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $<
@@ -239,7 +239,7 @@ fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
$(__fl_demo2___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p fl_demo2.app/Contents
mkdir -p fl_demo2.app/Contents/MacOS
mkdir -p fl_demo2.app/Contents/Resources
@@ -260,7 +260,7 @@ fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo2.app/Contents/Resources/fl_demo2.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns fl_demo2.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@fl_demo2_bundle: fl_demo2.app/Contents
@COND_PLATFORM_MACOSX_1@fl_demo2_bundle: fl_demo2.app/Contents/PkgInfo
fl_demo2_fl_demo2.o: $(srcdir)/fl_demo2.cpp
$(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $<
@@ -274,7 +274,7 @@ fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
$(__fl_sample1___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p fl_sample1.app/Contents
mkdir -p fl_sample1.app/Contents/MacOS
mkdir -p fl_sample1.app/Contents/Resources
@@ -295,7 +295,7 @@ fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample1.app/Contents/Resources/fl_sample1.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample1.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@fl_sample1_bundle: fl_sample1.app/Contents
@COND_PLATFORM_MACOSX_1@fl_sample1_bundle: fl_sample1.app/Contents/PkgInfo
fl_sample1_fl_sample1.o: $(srcdir)/fl_sample1.cpp
$(CXXC) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $<
@@ -309,7 +309,7 @@ fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
$(__fl_sample2___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p fl_sample2.app/Contents
mkdir -p fl_sample2.app/Contents/MacOS
mkdir -p fl_sample2.app/Contents/Resources
@@ -330,7 +330,7 @@ fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample2.app/Contents/Resources/fl_sample2.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample2.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@fl_sample2_bundle: fl_sample2.app/Contents
@COND_PLATFORM_MACOSX_1@fl_sample2_bundle: fl_sample2.app/Contents/PkgInfo
fl_sample2_fl_sample2.o: $(srcdir)/fl_sample2.cpp
$(CXXC) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $<
@@ -344,7 +344,7 @@ fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
$(__fl_sample3___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p fl_sample3.app/Contents
mkdir -p fl_sample3.app/Contents/MacOS
mkdir -p fl_sample3.app/Contents/Resources
@@ -365,7 +365,7 @@ fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample3.app/Contents/Resources/fl_sample3.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample3.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@fl_sample3_bundle: fl_sample3.app/Contents
@COND_PLATFORM_MACOSX_1@fl_sample3_bundle: fl_sample3.app/Contents/PkgInfo
fl_sample3_fl_sample3.o: $(srcdir)/fl_sample3.cpp
$(CXXC) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $<

View File

@@ -20,34 +20,39 @@ BCCDIR = $(MAKEDIR)\..
### Variables: ###
FL_DEMO1_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
-I.\..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
FL_DEMO1_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \
-DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
FL_DEMO1_OBJECTS = \
$(OBJS)\fl_demo1_fl_demo1.obj
FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
-I.\..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \
-DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
FL_DEMO2_OBJECTS = \
$(OBJS)\fl_demo2_fl_demo2.obj
FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
-I.\..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \
-DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
FL_SAMPLE1_OBJECTS = \
$(OBJS)\fl_sample1_fl_sample1.obj
FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
-I.\..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \
-DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
FL_SAMPLE2_OBJECTS = \
$(OBJS)\fl_sample2_fl_sample2.obj
FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
-I.\..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \
-DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
FL_SAMPLE3_OBJECTS = \
$(OBJS)\fl_sample3_fl_sample3.obj
OBJS = \
@@ -221,26 +226,26 @@ data_files:
for %f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
$(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
c0w32.obj $(FL_DEMO1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__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) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_demo1_fl_demo1.res
|
$(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
c0w32.obj $(FL_DEMO2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__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) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_demo2_fl_demo2.res
|
$(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.res
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
c0w32.obj $(FL_SAMPLE1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__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) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample1_fl_sample1.res
|
$(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.res
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
c0w32.obj $(FL_SAMPLE2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__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) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample2_fl_sample2.res
|
$(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.res
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
c0w32.obj $(FL_SAMPLE3_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__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) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample3_fl_sample3.res
|