From 3943f867654bb2e26edb2f9ab957df0d3a917a6c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 4 Jul 2003 23:15:04 +0000 Subject: [PATCH] regenerated after Mattia's changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/grid/makefile.gcc | 10 +++++----- samples/listctrl/makefile.gcc | 8 ++++---- samples/treectrl/makefile.gcc | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc index a883eee21a..71918a639a 100644 --- a/samples/grid/makefile.gcc +++ b/samples/grid/makefile.gcc @@ -113,18 +113,18 @@ $(OBJS): all: $(OBJS)\grid.exe -$(OBJS)\grid_grid_rc.o: .\grid.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) - $(OBJS)\grid_griddemo.o: .\griddemo.cpp $(CXX) -c -o $@ $(GRID_CXXFLAGS) $< +$(OBJS)\grid_griddemo_rc.o: .\griddemo.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) + clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe -$(OBJS)\grid.exe: $(OBJS)\grid_griddemo.o $(OBJS)\grid_grid_rc.o - $(CXX) -o $@ $(OBJS)\grid_griddemo.o $(OBJS)\grid_grid_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\grid.exe: $(OBJS)\grid_griddemo.o $(OBJS)\grid_griddemo_rc.o + $(CXX) -o $@ $(OBJS)\grid_griddemo.o $(OBJS)\grid_griddemo_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 install: all diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc index 79ec176c69..0b6b9b0574 100644 --- a/samples/listctrl/makefile.gcc +++ b/samples/listctrl/makefile.gcc @@ -113,10 +113,10 @@ $(OBJS): all: $(OBJS)\listctrl.exe -$(OBJS)\listctrl_listctrl.o: .\listctrl.cpp +$(OBJS)\listctrl_listtest.o: .\listtest.cpp $(CXX) -c -o $@ $(LISTCTRL_CXXFLAGS) $< -$(OBJS)\listctrl_listctrl_rc.o: .\listctrl.rc +$(OBJS)\listctrl_listtest_rc.o: .\listtest.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) clean: @@ -125,8 +125,8 @@ clean: install: all -$(OBJS)\listctrl.exe: $(OBJS)\listctrl_listctrl.o $(OBJS)\listctrl_listctrl_rc.o - $(CXX) -o $@ $(OBJS)\listctrl_listctrl.o $(OBJS)\listctrl_listctrl_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\listctrl.exe: $(OBJS)\listctrl_listtest.o $(OBJS)\listctrl_listtest_rc.o + $(CXX) -o $@ $(OBJS)\listctrl_listtest.o $(OBJS)\listctrl_listtest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 uninstall: diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc index 845307f3de..7980b843f4 100644 --- a/samples/treectrl/makefile.gcc +++ b/samples/treectrl/makefile.gcc @@ -113,10 +113,10 @@ $(OBJS): all: $(OBJS)\treectrl.exe -$(OBJS)\treectrl_treectrl.o: .\treectrl.cpp +$(OBJS)\treectrl_treetest.o: .\treetest.cpp $(CXX) -c -o $@ $(TREECTRL_CXXFLAGS) $< -$(OBJS)\treectrl_treectrl_rc.o: .\treectrl.rc +$(OBJS)\treectrl_treetest_rc.o: .\treetest.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) clean: @@ -125,8 +125,8 @@ clean: install: all -$(OBJS)\treectrl.exe: $(OBJS)\treectrl_treectrl.o $(OBJS)\treectrl_treectrl_rc.o - $(CXX) -o $@ $(OBJS)\treectrl_treectrl.o $(OBJS)\treectrl_treectrl_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\treectrl.exe: $(OBJS)\treectrl_treetest.o $(OBJS)\treectrl_treetest_rc.o + $(CXX) -o $@ $(OBJS)\treectrl_treetest.o $(OBJS)\treectrl_treetest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 uninstall: -- 2.47.2