[Scummvm-cvs-logs] scummvm master -> 8f36c52e5866bde77a5f79ac6c1ea96152e5e22f

fingolfin max at quendi.de
Wed Jun 1 23:58:56 CEST 2011


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
70d5da3bc4 DEVTOOLS: Link create_kyradat against libcommon.a, for scumm_stricmp
8f36c52e58 DEVTOOLS: Do not use -Wglobal-constructors on create_project.o


Commit: 70d5da3bc4362894c875b00ced1b289d18898258
    https://github.com/scummvm/scummvm/commit/70d5da3bc4362894c875b00ced1b289d18898258
Author: Max Horn (max at quendi.de)
Date: 2011-06-01T14:57:21-07:00

Commit Message:
DEVTOOLS: Link create_kyradat against libcommon.a, for scumm_stricmp

Changed paths:
    devtools/create_kyradat/module.mk
    rules.mk



diff --git a/devtools/create_kyradat/module.mk b/devtools/create_kyradat/module.mk
index fb458b4..4241f82 100644
--- a/devtools/create_kyradat/module.mk
+++ b/devtools/create_kyradat/module.mk
@@ -14,5 +14,8 @@ MODULE_OBJS := \
 # Set the name of the executable
 TOOL_EXECUTABLE := create_kyradat
 
+# Link against common code (for scumm_stricmp)
+TOOL_DEPS := common/libcommon.a
+
 # Include common rules
 include $(srcdir)/rules.mk
diff --git a/rules.mk b/rules.mk
index d03f549..5ab3754 100644
--- a/rules.mk
+++ b/rules.mk
@@ -20,11 +20,12 @@ ifdef TOOL_EXECUTABLE
 # TODO: Refactor this, so that even our master executable can use this rule?
 ################################################
 TOOL-$(MODULE) := $(MODULE)/$(TOOL_EXECUTABLE)$(EXEEXT)
-$(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE))
+$(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(TOOL_DEPS)
 	$(QUIET_CXX)$(CXX) $(LDFLAGS) $+ -o $@
 
-# Reset TOOL_EXECUTABLE var
+# Reset TOOL_* vars
 TOOL_EXECUTABLE:=
+TOOL_DEPS:=
 
 # Add to "devtools" target
 devtools: $(TOOL-$(MODULE))


Commit: 8f36c52e5866bde77a5f79ac6c1ea96152e5e22f
    https://github.com/scummvm/scummvm/commit/8f36c52e5866bde77a5f79ac6c1ea96152e5e22f
Author: Max Horn (max at quendi.de)
Date: 2011-06-01T14:57:21-07:00

Commit Message:
DEVTOOLS: Do not use -Wglobal-constructors on create_project.o

Changed paths:
    devtools/create_project/module.mk



diff --git a/devtools/create_project/module.mk b/devtools/create_project/module.mk
index 025cbf4..0db070f 100644
--- a/devtools/create_project/module.mk
+++ b/devtools/create_project/module.mk
@@ -12,6 +12,11 @@ MODULE_OBJS := \
 # Set the name of the executable
 TOOL_EXECUTABLE := create_project
 
+# Set custom build flags for create_project.o: It uses C++ iostreams,
+# which make use of global constructors. So we don't want warnings for
+# that.
+$(srcdir)/devtools/create_project/create_project.o: CXXFLAGS:=$(filter-out -Wglobal-constructors,$(CXXFLAGS))
+
 # Include common rules
 include $(srcdir)/rules.mk
 






More information about the Scummvm-git-logs mailing list