From: <ma...@us...> - 2003-11-27 15:43:16
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv22053 Modified Files: Makefile.win Log Message: removed statusbar from objects, no longer used Index: Makefile.win =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile.win,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Makefile.win 23 Nov 2003 20:16:43 -0000 1.24 +++ Makefile.win 27 Nov 2003 15:43:13 -0000 1.25 @@ -1,84 +1,83 @@ -# +++ Configuration settings section +++ - -# WXCONFIG should point to your wx-config file (usually at /usr/local/bin) -WXCONFIG = wx-config - -# Don't modify these - automatically generated from WXCONFIG -CXX = $(shell $(WXCONFIG) --cxx) -CXX_FLAGS = $(shell $(WXCONFIG) --cxxflags) -LIBS = $(shell $(WXCONFIG) --libs) - -# Normal CPP flags -#CPP_FLAGS = -O2 -pipe -I. -c -Wall - -# Debugging CPP flags -DEBUG_FLAGS = -ggdb -pipe -I. -c -g -ggdb -Wall - -# Only needed on Win32 - Location of windres.exe file -WINDRES = windres.exe - -# Any extra include directives needed -INCLUDE_DIR = /local/include - -# Our own defines. Only one of meaning is -D__HAVE_REMOVE_GROWABLE_COL__, -# which should only be enabled if you have patched wxWindows with sizer.patch -DEFINES = -D__HAVE_REMOVE_GROWABLE_COL__ - -# Final binary name -PROGRAM = wxInterface - -# +++ Objects section +++ -# Objects list. If new files are added to source tree, add them here also. -OBJECTS = ColorFrameCtrl.o \ - DownloadListCtrl.o \ - GUISettingsDlg.o \ - Images.o \ - KnownListCtrl.o \ - MainDlg.o \ - MessagesWnd.o \ - MListCtrl.o \ - QueueListCtrl.o \ - SBPanel.o \ - SearchListCtrl.o \ - SearchWnd.o \ - ServerListCtrl.o \ - ServerWnd.o \ - SharedFilesListCtrl.o \ - SharedFilesWnd.o \ - StatisticsWnd.o \ - StatisticsTreeCtrl.o \ - StatusBar.o \ - SysTray.o \ - TransferWnd.o \ - UploadListCtrl.o \ - wxInterface.o \ - wxInterface_wdr.o \ - wxInterface_private.res -# wxInterface_private.res is needed only on win32 platform. Comment out -# on all other platforms. - -# File suffixes -.SUFFIXES: .o .cpp .rc .res - -# +++ Compilation/linking commands section +++ -# Compile commands. To make DEBUG build, add $(DEBUG_FLAGS) flag to this command. -.cpp.o : - @echo "Compiling $< to $@..."; - @$(CXX) $(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS) -o $@ $< -.rc.res: - @echo "Running windres..."; - @windres -i $< -I rc -o $@ -O coff --include-dir=$(INCLUDE_DIR) - -# Linking command -$(PROGRAM): $(OBJECTS) - @echo "Linking wxInterface..."; - @$(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS) - -# +++ Building section +++ -# All builds program with default settings. -all: $(PROGRAM) - -# Cleanup command -clean: - @echo "Cleaning up..."; - @rm -f $(OBJECTS) $(PROGRAM) +# +++ Configuration settings section +++ + +# WXCONFIG should point to your wx-config file (usually at /usr/local/bin) +WXCONFIG = wx-config + +# Don't modify these - automatically generated from WXCONFIG +CXX = $(shell $(WXCONFIG) --cxx) +CXX_FLAGS = $(shell $(WXCONFIG) --cxxflags) +LIBS = $(shell $(WXCONFIG) --libs) + +# Normal CPP flags +#CPP_FLAGS = -O2 -pipe -I. -c -Wall + +# Debugging CPP flags +DEBUG_FLAGS = -ggdb -pipe -I. -c -g -ggdb -Wall + +# Only needed on Win32 - Location of windres.exe file +WINDRES = windres.exe + +# Any extra include directives needed +INCLUDE_DIR = /local/include + +# Our own defines. Only one of meaning is -D__HAVE_REMOVE_GROWABLE_COL__, +# which should only be enabled if you have patched wxWindows with sizer.patch +DEFINES = -D__HAVE_REMOVE_GROWABLE_COL__ + +# Final binary name +PROGRAM = wxInterface + +# +++ Objects section +++ +# Objects list. If new files are added to source tree, add them here also. +OBJECTS = ColorFrameCtrl.o \ + DownloadListCtrl.o \ + GUISettingsDlg.o \ + Images.o \ + KnownListCtrl.o \ + MainDlg.o \ + MessagesWnd.o \ + MListCtrl.o \ + QueueListCtrl.o \ + SBPanel.o \ + SearchListCtrl.o \ + SearchWnd.o \ + ServerListCtrl.o \ + ServerWnd.o \ + SharedFilesListCtrl.o \ + SharedFilesWnd.o \ + StatisticsWnd.o \ + StatisticsTreeCtrl.o \ + SysTray.o \ + TransferWnd.o \ + UploadListCtrl.o \ + wxInterface.o \ + wxInterface_wdr.o \ + wxInterface_private.res +# wxInterface_private.res is needed only on win32 platform. Comment out +# on all other platforms. + +# File suffixes +.SUFFIXES: .o .cpp .rc .res + +# +++ Compilation/linking commands section +++ +# Compile commands. To make DEBUG build, add $(DEBUG_FLAGS) flag to this command. +.cpp.o : + @echo "Compiling $< to $@..."; + @$(CXX) $(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS) -o $@ $< +.rc.res: + @echo "Running windres..."; + @windres -i $< -I rc -o $@ -O coff --include-dir=$(INCLUDE_DIR) + +# Linking command +$(PROGRAM): $(OBJECTS) + @echo "Linking wxInterface..."; + @$(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS) + +# +++ Building section +++ +# All builds program with default settings. +all: $(PROGRAM) + +# Cleanup command +clean: + @echo "Cleaning up..."; + @rm -f $(OBJECTS) $(PROGRAM) |