Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regenerated makefiles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-08-22 21:02:44 +00:00
parent 16aa9c84bc
commit e8f60bac1a
137 changed files with 2233 additions and 2623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
contrib/samples/ogl/studio/Makefile.in
View File

@@ -13,7 +13,6 @@ INSTALL = @INSTALL@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
EXEEXT = @EXEEXT@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
HOST_SUFFIX = @HOST_SUFFIX@
@@ -53,8 +52,6 @@ WX_VERSION = 2.5.0
### Conditionally set variables: ###
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -85,7 +82,7 @@ WX_VERSION = 2.5.0
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 -i \
$(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r \
$(srcdir)/../../../include -o studio Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
COND_MONOLITHIC_0___WXLIB_ADV_p = \
@@ -103,19 +100,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
@COND_PLATFORM_MAC_1@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C studio$(EXEEXT)
@COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = $(SETFILE) -a C studio
@COND_PLATFORM_WIN32_1@__studio___win32rc = studio_studio_rc.o
@COND_PLATFORM_MACOSX_1@__studio_bundle___depname = studio_bundle
### Targets: ###
all: studio$(EXEEXT) $(__studio_bundle___depname) data
all: studio $(__studio_bundle___depname) data
clean:
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f studio$(EXEEXT)
rm -f studio
rm -rf studio.app
data:
@@ -133,13 +129,13 @@ install: all
install-strip: install
studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
studio: $(STUDIO_OBJECTS) $(__studio___win32rc)
$(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
$(__studio___mac_rezcmd)
$(__studio___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
studio.app/Contents: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
studio.app/Contents: studio $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p studio.app/Contents
mkdir -p studio.app/Contents/MacOS
mkdir -p studio.app/Contents/Resources
@@ -154,7 +150,7 @@ studio.app/Contents: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
echo -n "APPL????" >studio.app/Contents/PkgInfo
ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio
ln -f studio studio.app/Contents/MacOS/studio
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc studio.app/Contents/Resources/studio.rsrc
@@ -163,37 +159,37 @@ studio.app/Contents: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
@COND_PLATFORM_MACOSX_1@studio_bundle: studio.app/Contents
studio_cspalette.o: $(srcdir)/cspalette.cpp
$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
studio_csprint.o: $(srcdir)/csprint.cpp
$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
studio_dialogs.o: $(srcdir)/dialogs.cpp
$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
studio_doc.o: $(srcdir)/doc.cpp
$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
studio_mainfrm.o: $(srcdir)/mainfrm.cpp
$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
studio_project.o: $(srcdir)/project.cpp
$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
studio_shapes.o: $(srcdir)/shapes.cpp
$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
studio_studio.o: $(srcdir)/studio.cpp
$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
studio_studio_rc.o: $(srcdir)/studio.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 --include-dir $(srcdir)/../../../include
studio_symbols.o: $(srcdir)/symbols.cpp
$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
studio_view.o: $(srcdir)/view.cpp
$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
uninstall:

2
contrib/samples/ogl/studio/makefile.wat
View File

@@ -242,7 +242,7 @@ $(OBJS)\studio.exe : $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res
@%create $(OBJS)\studio.lbc
@%append $(OBJS)\studio.lbc option quiet
@%append $(OBJS)\studio.lbc name $^@
@%append $(OBJS)\studio.lbc option incremental
@%append $(OBJS)\studio.lbc option caseexact
@%append $(OBJS)\studio.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
@for %i in ($(STUDIO_OBJECTS)) do @%append $(OBJS)\studio.lbc file %i
@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_ADV_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 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)\studio.lbc library %i