ChangeLogTag: Wed Oct 29 07:03:12 2003 UTC Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 43 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5627f2ea048..69f2979ad70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Wed Oct 29 07:03:12 2003  UTC Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/rules.local.GNU:
+          Added a rule so that files with extension .rc are compiled with
+          COMPILE.rc which is then the RC. By setting then RC to the
+          resource compiler in the specific GNU file resource files are
+          compiled.
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Added COMPILE.rc rule that uses the new RC to make it easy to set the
+          resource compiler needed.
+
+        * include/makeinclude/platform_gnuwin32_common.GNU:
+          Set RC to windres. Cygwin and MinGW have a resource compiler and then
+          put version info into the DLL.
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+          Generate the resource files into the makefile and when RC is set add
+          those files to FILES so that the resource files are compiled.
+
+          Thanks to Andrew L. Shwaika <als@solvo.ru> for pointing us at the
+          possibility to use a resource compiler with MinGW.
+
 Tue Oct 28 17:07:19 2003  Steve Huston  <shuston@riverace.com>
 
 	* Makefile.am: Added definition of ACLOCAL so autoconf stuff gets
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index d74b71149e8..6f389310f2b 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -65,6 +65,13 @@ FILES = \
 <%endfor%>
 
 <%endif%>
+<%if(resource_files)%>
+RESOURCES += \
+<%foreach(resource_files)%>
+  <%resource_file%><%fornotlast(" \\")%>
+<%endfor%>
+
+<%endif%>
 <%vpath%>
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -243,6 +250,10 @@ endif
 OBJS   = $(addsuffix .o, <%notdirfiles%>)
 SRC    = $(addsuffix .cpp, $(FILES))
 <%endif%>
+ifneq (,$(RC))
+  FILES += $(RESOURCES)
+endif
+
 <%if(sharedname)%>
 LSRC   = $(addsuffix .cpp, $(FILES))
 <%endif%>
diff --git a/include/makeinclude/platform_gnuwin32_common.GNU b/include/makeinclude/platform_gnuwin32_common.GNU
index bf6be6bdb0d..4044c2b83c1 100644
--- a/include/makeinclude/platform_gnuwin32_common.GNU
+++ b/include/makeinclude/platform_gnuwin32_common.GNU
@@ -47,13 +47,13 @@ endif
 ifeq (,$(pipes))
   pipes = 1
 endif
-
 ifeq ($(debug),0)
 CFLAGS += -DNDEBUG
 endif
 
 CC      = gcc
 CXX     = g++
+RC      = windres
 
 MODEL_FLAGS += -mcpu=$(TCPU)
 
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index 8df678f94b0..d63cbae835a 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -95,6 +95,11 @@ $(VSHDIR)%.$(OBJEXT): %.cxx $(VSHDIR).creation_stamp
 $(VSHDIR)%.$(OBJEXT): %.c $(VSHDIR).creation_stamp
 	$(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
 
+ifneq (,$(COMPILE.rc))
+$(VSHDIR)%.rc.$(OBJEXT): %.rc $(VSHDIR).creation_stamp
+	$(COMPILE.rc) $< $@
+endif
+
 $(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT)
 	$(SOLINK)
 endif
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 0eb429cc527..d510e20b278 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -100,8 +100,10 @@
 #  ARFLAGS      Flags for the archive utility (ar)
 #  CC           C compiler command
 #  CXX          C++ compiler command
+#  RC           Resource compiler command
 #  COMPILE.c    Flags for compiling with C
 #  COMPILE.cc   Flags for compiling with C++
+#  COMPILE.rc   Flags for compiling with the resource compiler
 #  CPPFLAGS     C pre-processor flags
 #  CFLAGS       C compilation flags
 #  CCFLAGS      C++ compilation flags
@@ -725,6 +727,7 @@ endif # pipes
 
 COMPILE.c       = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 COMPILE.cc      = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) -c
+COMPILE.rc      = $(RC)
 COMPILE-NO_DASH_G.cc = `echo $(COMPILE.cc) | sed 's/-g //'`
 # 960905 Marius Kjeldahl <marius@funcom.com>
 # Added the line below to be used for compiling executable shared objects