[ShareDaemon-CVS] ui-wx/src Makefile,1.27,1.28 wxInterface_private.rc,1.1,1.2

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29751

Modified Files:
	Makefile wxInterface_private.rc 
Log Message:
Minor make system modifications. Works better on win32 now.

Index: Makefile
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile	20 Nov 2003 01:27:26 -0000	1.27
+++ Makefile	21 Nov 2003 03:01:32 -0000	1.28
@@ -1,8 +1,34 @@
-WXCONFIG = wx-config
-CXX = $(shell $(WXCONFIG) --cxx)
+# +++ Configuration settings section +++
 
-PROGRAM = wxInterface
+# WXCONFIG should point to your wx-config file (usually at /usr/local/bin)
+WXCONFIG = /wx/dynamic/2.4.2/bin/wxgtk-2.4-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 \
@@ -27,22 +53,28 @@
 		UploadListCtrl.o \
 		wxInterface.o \
 		wxInterface_wdr.o \
-#		wxInterface_private.res \
-# uncomment xmule2-ui-wx_private.res file under win32, 
-# comment out on all other systems.
-		
-# implementation
+#		wxInterface_private.res
+# wxInterface_private.res is needed only on win32 platform. Comment out
+# on all other platforms.
 
-.SUFFIXES:	.o .cpp
+# 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 :
-	$(CXX) -O2 -pipe -g -I. -c -Wall -I"/local/include" `$(WXCONFIG) --cxxflags` -o $@ $<
-
-all:    $(PROGRAM)
+	$(CXX) $(CPP_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS) -o $@ $<
+.rc.res:
+	 windres -i $< -I rc -o $@ -O coff --include-dir=$(INCLUDE_DIR)
 
+# Linking command
 $(PROGRAM):	$(OBJECTS)
-	$(CXX) -O2 -o $(PROGRAM) $(OBJECTS) `$(WXCONFIG) --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS)
 
-clean: 
-	rm -f *.o $(PROGRAM)
+# +++ Building section +++
+# All builds program with default settings.
+all:    $(PROGRAM)
 
+# Cleanup command
+clean: 
+	rm -f $(OBJECTS) $(PROGRAM)

Index: wxInterface_private.rc
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface_private.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wxInterface_private.rc	20 Nov 2003 01:27:26 -0000	1.1
+++ wxInterface_private.rc	21 Nov 2003 03:01:32 -0000	1.2
@@ -3,11 +3,11 @@
 
 //#include "xmule2-ui-wx_private.rc"
 #include <wx/msw/wx.rc>
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "xmule2-ui-wx.ico"
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "wxInterface.ico"
 
 //
 // SUPPORT FOR WINDOWS XP THEMES:
 // THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS
 // LIBRARY VERSION 6.0 (IF IT IS AVAILABLE)
 //
-1 24 "wxInterface.exe.Manifest"
+//1 24 "wxInterface.exe.Manifest"