[Scummvm-git-logs] scummvm master -> 99b66cece7b82efe42823de49fcbbb073dbc6bb8

aquadran aquadran at gmail.com
Sat Mar 20 13:00:09 UTC 2021


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

Summary:
99b66cece7 DEVTOOLS: Silence linker warning by convert c file to c++


Commit: 99b66cece7b82efe42823de49fcbbb073dbc6bb8
    https://github.com/scummvm/scummvm/commit/99b66cece7b82efe42823de49fcbbb073dbc6bb8
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-03-20T14:00:03+01:00

Commit Message:
DEVTOOLS: Silence linker warning by convert c file to c++

Changed paths:
  A devtools/make-scumm-fontdata.cpp
  A devtools/md5table.cpp
  R devtools/make-scumm-fontdata.c
  R devtools/md5table.c
    devtools/module.mk


diff --git a/devtools/make-scumm-fontdata.c b/devtools/make-scumm-fontdata.cpp
similarity index 99%
rename from devtools/make-scumm-fontdata.c
rename to devtools/make-scumm-fontdata.cpp
index 24057ac4cb..268d3339dd 100644
--- a/devtools/make-scumm-fontdata.c
+++ b/devtools/make-scumm-fontdata.cpp
@@ -850,7 +850,7 @@ void compressCharset(const unsigned char *data, const char *var, const char *nam
 	printf("};\n\n");
 }
 
-int main() {
+int main(int /*argc*/, char ** /*argv*/) {
 	int i, j;
 
 	printf("// These replacement character tables have been created using the\n");
diff --git a/devtools/md5table.c b/devtools/md5table.cpp
similarity index 100%
rename from devtools/md5table.c
rename to devtools/md5table.cpp
diff --git a/devtools/module.mk b/devtools/module.mk
index 542a4da1a1..de2644459f 100644
--- a/devtools/module.mk
+++ b/devtools/module.mk
@@ -36,11 +36,11 @@ devtools/convbdf$(EXEEXT): $(srcdir)/devtools/convbdf.cpp
 	$(QUIET)$(MKDIR) devtools/$(DEPDIR)
 	+$(QUIET_LINK)$(LD) $(CXXFLAGS) -Wall -o $@ $<
 
-devtools/md5table$(EXEEXT): $(srcdir)/devtools/md5table.c
+devtools/md5table$(EXEEXT): $(srcdir)/devtools/md5table.cpp
 	$(QUIET)$(MKDIR) devtools/$(DEPDIR)
 	+$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
 
-devtools/make-scumm-fontdata$(EXEEXT): $(srcdir)/devtools/make-scumm-fontdata.c
+devtools/make-scumm-fontdata$(EXEEXT): $(srcdir)/devtools/make-scumm-fontdata.cpp
 	$(QUIET)$(MKDIR) devtools/$(DEPDIR)
 	+$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
 




More information about the Scummvm-git-logs mailing list