[cadcdev-svn-commits] [SCM] branch master updated. 63545378b55b22f02d865ba68617095050fe7b5a

[quzar <qu...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  63545378b55b22f02d865ba68617095050fe7b5a (commit)
       via  573461f60107d3711c67872c0f13c287f57d644c (commit)
       via  703643ecfc4c1e16858e402f62fc0161239e849c (commit)
      from  93519b5546411b0d6a723f74884753056212ff97 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 63545378b55b22f02d865ba68617095050fe7b5a
Author: Falco Girgis <gyr...@gm...>
Date:   Mon Sep 23 11:45:22 2024 -0500

    Fixed KOS's Makefile.rules. (#752)
    
    They were incorrect and were causing really annoying warnings on other
    projects, such as GTA3, where C++ was warning that "-std=gnu17" is only
    available in C++.
    
    How does this happen? Because our Makefile.rules file was INCORRECTLY
    concatenating CFLAGS and CXXFLAGS and sending them to the C++ compiler.
    
    This is incorrect. Those two are separate and should go to their
    respective compilers only; however, CPPFLAGS is supposed to be common,
    shared, preprocessor flags that go to both.
    
    - Removed CFLAGS from C++ rules
    - Added CPPFLAGS to C, C++, ObjC, and ObjC++ rules

commit 573461f60107d3711c67872c0f13c287f57d644c
Author: Donald Haase <qu...@ya...>
Date:   Mon Sep 23 12:43:58 2024 -0400

    Remove sd from the list of examples folders (#769)

commit 703643ecfc4c1e16858e402f62fc0161239e849c
Author: Donald Haase <qu...@ya...>
Date:   Mon Sep 23 12:42:35 2024 -0400

    Add workaround for inlining to support c89 user code (namely opus libs from kos-ports). (#768)

-----------------------------------------------------------------------

Summary of changes:
 Makefile.rules              | 20 ++++++++++----------
 examples/dreamcast/Makefile |  2 +-
 include/kos/cdefs.h         |  4 ++++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Makefile.rules b/Makefile.rules
index a62b1a5a..bcd35e88 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -11,36 +11,36 @@
 ifndef KOS_DEPDIR
 
 %.o: %.c
-	kos-cc $(CFLAGS) -c $< -o $@
+	kos-cc $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 %.o: %.cc
-	kos-c++ $(CFLAGS) $(CXXFLAGS) -c $< -o $@
+	kos-c++ $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
 
 %.o: %.cpp
-	kos-c++ $(CFLAGS) $(CXXFLAGS) -c $< -o $@
+	kos-c++ $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
 
 %.o: %.m
-	kos-cc $(CFLAGS) -c $< -o $@
+	kos-cc $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 %.o: %.mm
-	kos-c++ $(CFLAGS) $(CXXFLAGS) -c $< -o $@
+	kos-c++ $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
 
 else
 
 %.o: %.c
-	kos-cc $(CFLAGS) -c $< -o $@ -MD -MF $(KOS_DEPDIR)/$(patsubst %.c,%.md,$(subst /,__,$(subst ..,,$<)))
+	kos-cc $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -MD -MF $(KOS_DEPDIR)/$(patsubst %.c,%.md,$(subst /,__,$(subst ..,,$<)))
 
 %.o: %.cc
-	kos-c++ $(CFLAGS) $(CXXFLAGS) -c $< -o $@ -MD -MF $(KOS_DEPDIR)/$(patsubst %.c,%.md,$(subst /,__,$(subst ..,,$<)))
+	kos-c++ $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ -MD -MF $(KOS_DEPDIR)/$(patsubst %.c,%.md,$(subst /,__,$(subst ..,,$<)))
 
 %.o: %.cpp
-	kos-c++ $(CFLAGS) $(CXXFLAGS) -c $< -o $@ -MD -MF $(KOS_DEPDIR)/$(patsubst %.c,%.md,$(subst /,__,$(subst ..,,$<)))
+	kos-c++ $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ -MD -MF $(KOS_DEPDIR)/$(patsubst %.c,%.md,$(subst /,__,$(subst ..,,$<)))
 
 %.o: %.m
-	kos-cc $(CFLAGS) -c $< -o $@ -MD -MF $(KOS_DEPDIR)/$(patsubst %.m,%.md,$(subst /,__,$(subst ..,,$<)))
+	kos-cc $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -MD -MF $(KOS_DEPDIR)/$(patsubst %.m,%.md,$(subst /,__,$(subst ..,,$<)))
 
 %.o: %.mm
-	kos-c++ $(CFLAGS) $(CXXFLAGS) -c $< -o $@ -MD -MF $(KOS_DEPDIR)/$(patsubst %.mm,%.md,$(subst /,__,$(subst ..,,$<)))
+	kos-c++ $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ -MD -MF $(KOS_DEPDIR)/$(patsubst %.mm,%.md,$(subst /,__,$(subst ..,,$<)))
 
 -include $(wildcard $(KOS_DEPDIR)/*.md)
 
diff --git a/examples/dreamcast/Makefile b/examples/dreamcast/Makefile
index 221b371c..fb58d7e8 100644
--- a/examples/dreamcast/Makefile
+++ b/examples/dreamcast/Makefile
@@ -6,7 +6,7 @@
 #
 
 DIRS = 2ndmix basic libdream kgl hello sound png vmu conio pvr video \
-	   lua parallax dreameye filesystem sd lightgun keyboard sdl dev rumble \
+	   lua parallax dreameye filesystem lightgun keyboard sdl dev rumble \
 	   micropython
 
 ifneq ($(KOS_SUBARCH), naomi)
diff --git a/include/kos/cdefs.h b/include/kos/cdefs.h
index 9e34f13a..0aa77349 100644
--- a/include/kos/cdefs.h
+++ b/include/kos/cdefs.h
@@ -181,6 +181,10 @@
 #define __extension__
 #endif
 
+#ifndef __GNUC_STDC_INLINE__
+#define inline __inline__
+#endif
+
 /** @} */
 
 #endif  /* __KOS_CDEFS_H */


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.