https://github.com/libsdl-org/Maelstrom/commit/45f9e140ca6efdda06e23b11f6e806df99e290a1
From 45f9e140ca6efdda06e23b11f6e806df99e290a1 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sat, 29 Oct 2011 02:13:42 -0400
Subject: [PATCH] Removed project include paths to keep includes honest.
---
Maelstrom-netd.c | 2 +-
MaelstromUI.cpp | 1 -
Maelstrom_Globals.h | 13 +++++++------
configure.in | 8 --------
dialog.h | 4 ++--
load.h | 4 ++--
logic.h | 2 +-
maclib/Mac_FontServ.h | 2 +-
main.cpp | 4 ++--
netlogic/about.cpp | 2 +-
netlogic/game.cpp | 4 ++--
netlogic/logic.cpp | 2 +-
netlogic/make.cpp | 2 +-
netlogic/netplay.cpp | 2 +-
netlogic/object.cpp | 2 +-
netlogic/objects.cpp | 2 +-
netlogic/player.cpp | 2 +-
screenlib/SDL_FrameBuf.cpp | 2 +-
screenlib/UIElementLabel.cpp | 26 ++++++++++++++++++++++++--
screenlib/UIElementLine.cpp | 21 +++++++++++++++++++++
screenlib/UIElementRect.cpp | 21 +++++++++++++++++++++
screenlib/UIElementTexture.cpp | 23 ++++++++++++++++++++++-
22 files changed, 114 insertions(+), 37 deletions(-)
diff --git a/Maelstrom-netd.c b/Maelstrom-netd.c
index cd4ad850..86f0fa7a 100644
--- a/Maelstrom-netd.c
+++ b/Maelstrom-netd.c
@@ -22,7 +22,7 @@
the same. Otherwise we crash.
*/
-#include "protocol.h"
+#include "netlogic/protocol.h"
#define MAX_CONNECTIONS 64
#define UNCONNECTED 0
diff --git a/MaelstromUI.cpp b/MaelstromUI.cpp
index d3797ccc..0517833c 100644
--- a/MaelstromUI.cpp
+++ b/MaelstromUI.cpp
@@ -10,7 +10,6 @@
#include "UIDialogLabel.h"
#include "UIElementIcon.h"
#include "UIElementKeyButton.h"
-#include "UIElementLabel.h"
#include "UIElementSprite.h"
#include "UIElementTitle.h"
diff --git a/Maelstrom_Globals.h b/Maelstrom_Globals.h
index 1fde751e..6e0d81ff 100644
--- a/Maelstrom_Globals.h
+++ b/Maelstrom_Globals.h
@@ -4,12 +4,13 @@
#include <stdlib.h>
-#include "SDL_FrameBuf.h"
-#include "Mac_FontServ.h"
-#include "Mac_Sound.h"
-#include "Mac_Compat.h"
-#include "UIManager.h"
-#include "UIPanel.h"
+#include "screenlib/SDL_FrameBuf.h"
+#include "screenlib/UIManager.h"
+#include "screenlib/UIPanel.h"
+
+#include "maclib/Mac_FontServ.h"
+#include "maclib/Mac_Sound.h"
+#include "maclib/Mac_Compat.h"
#include "Maelstrom.h"
diff --git a/configure.in b/configure.in
index a4a8e7eb..66c5cefe 100644
--- a/configure.in
+++ b/configure.in
@@ -87,13 +87,6 @@ else
fi
AC_MSG_RESULT($use_checksum)
-dnl Add the include directories for the object libraries
-CFLAGS="$CFLAGS -I\$(top_srcdir)"
-CFLAGS="$CFLAGS -I\$(top_srcdir)/netlogic"
-CFLAGS="$CFLAGS -I\$(top_srcdir)/screenlib"
-CFLAGS="$CFLAGS -I\$(top_srcdir)/maclib"
-CFLAGS="$CFLAGS -I\$(top_srcdir)/utils"
-
dnl Set up the icon object file, for Mingw32
case "$target" in
*-*-mingw32*)
@@ -121,7 +114,6 @@ case "$target" in
;;
esac
AC_SUBST(GAME_INSTALLDIR)
-CFLAGS="$CFLAGS -DLIBDIR=\\\"$GAME_INSTALLDIR\\\""
dnl C++ flags are the same as the C flags
CXXFLAGS="$CXXFLAGS $CFLAGS"
diff --git a/dialog.h b/dialog.h
index 10c6e67e..47f789e2 100644
--- a/dialog.h
+++ b/dialog.h
@@ -2,8 +2,8 @@
#include <stdio.h>
#include <stdarg.h>
-#include "SDL_FrameBuf.h"
-#include "Mac_FontServ.h"
+#include "screenlib/SDL_FrameBuf.h"
+#include "maclib/Mac_FontServ.h"
/* This is a class set for Macintosh-like dialogue boxes. :) */
/* Sorta complex... */
diff --git a/load.h b/load.h
index c88ec255..07768954 100644
--- a/load.h
+++ b/load.h
@@ -3,9 +3,9 @@
#define _load_h
#include <physfs.h>
-#include "physfsrwops.h"
+#include "utils/physfsrwops.h"
-#include "SDL_FrameBuf.h"
+#include "screenlib/SDL_FrameBuf.h"
/* Functions exported from load.cpp */
extern SDL_Texture *Load_Title(FrameBuf *screen, int title_id);
diff --git a/logic.h b/logic.h
index 8b73e2cc..eeac73a2 100644
--- a/logic.h
+++ b/logic.h
@@ -1,7 +1,7 @@
/* Game Logic interface routines and variables */
-#include "netlogic.h"
+#include "netlogic/netlogic.h"
/* From logic.cpp */
extern void LogicUsage(void);
diff --git a/maclib/Mac_FontServ.h b/maclib/Mac_FontServ.h
index d0df3fc5..0aa64131 100644
--- a/maclib/Mac_FontServ.h
+++ b/maclib/Mac_FontServ.h
@@ -39,7 +39,7 @@
#include <stdarg.h>
#include "Mac_Resource.h"
-#include "SDL_FrameBuf.h"
+#include "../screenlib/SDL_FrameBuf.h"
/* Different styles supported by the font server */
#define STYLE_NORM 0x00
diff --git a/main.cpp b/main.cpp
index a32a2040..bd627798 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,10 +14,10 @@
#include "load.h"
#include "fastrand.h"
#include "checksum.h"
-#include "about.h"
+#include "netlogic/about.h"
#include "main.h"
-#include "UIElementLabel.h"
+#include "screenlib/UIElementLabel.h"
#include "UIElementKeyButton.h"
/* External functions used in this file */
diff --git a/netlogic/about.cpp b/netlogic/about.cpp
index 149b544b..0017425f 100644
--- a/netlogic/about.cpp
+++ b/netlogic/about.cpp
@@ -1,5 +1,5 @@
-#include "Maelstrom_Globals.h"
+#include "../Maelstrom_Globals.h"
#include "object.h"
#include "about.h"
diff --git a/netlogic/game.cpp b/netlogic/game.cpp
index 6ff1e1f6..a38fc67a 100644
--- a/netlogic/game.cpp
+++ b/netlogic/game.cpp
@@ -1,10 +1,10 @@
-#include "Maelstrom_Globals.h"
+#include "../Maelstrom_Globals.h"
+#include "../load.h"
#include "object.h"
#include "player.h"
#include "netplay.h"
#include "make.h"
-#include "load.h"
#include "game.h"
#include "../screenlib/UIElementLabel.h"
#include "../screenlib/UIElementRect.h"
diff --git a/netlogic/logic.cpp b/netlogic/logic.cpp
index 8c70fa8e..4337a787 100644
--- a/netlogic/logic.cpp
+++ b/netlogic/logic.cpp
@@ -1,5 +1,5 @@
-#include "Maelstrom_Globals.h"
+#include "../Maelstrom_Globals.h"
#include "object.h"
#include "player.h"
#include "globals.h"
diff --git a/netlogic/make.cpp b/netlogic/make.cpp
index 4027535a..e1ab0423 100644
--- a/netlogic/make.cpp
+++ b/netlogic/make.cpp
@@ -1,5 +1,5 @@
-#include "Maelstrom_Globals.h"
+#include "../Maelstrom_Globals.h"
#include "netplay.h"
#include "object.h"
#include "player.h"
diff --git a/netlogic/netplay.cpp b/netlogic/netplay.cpp
index fd9a7028..9670a559 100644
--- a/netlogic/netplay.cpp
+++ b/netlogic/netplay.cpp
@@ -6,7 +6,7 @@
#include "SDL_net.h"
#include "SDL_endian.h"
-#include "Maelstrom_Globals.h"
+#include "../Maelstrom_Globals.h"
#include "netplay.h"
#include "protocol.h"
diff --git a/netlogic/object.cpp b/netlogic/object.cpp
index a57238d0..fa754edd 100644
--- a/netlogic/object.cpp
+++ b/netlogic/object.cpp
@@ -1,5 +1,5 @@
-#include "Maelstrom_Globals.h"
+#include "../Maelstrom_Globals.h"
#include "object.h"
diff --git a/netlogic/objects.cpp b/netlogic/objects.cpp
index 5776e5c3..5004493b 100644
--- a/netlogic/objects.cpp
+++ b/netlogic/objects.cpp
@@ -1,7 +1,7 @@
/* Here we define all of the strange and wonderous objects in the game */
-#include "Maelstrom_Globals.h"
+#include "../Maelstrom_Globals.h"
#include "netplay.h"
#include "object.h"
#include "player.h"
diff --git a/netlogic/player.cpp b/netlogic/player.cpp
index 5b6d45fd..5a1c2ab9 100644
--- a/netlogic/player.cpp
+++ b/netlogic/player.cpp
@@ -1,5 +1,5 @@
-#include "Maelstrom_Globals.h"
+#include "../Maelstrom_Globals.h"
#include "netplay.h"
#include "object.h"
#include "player.h"
diff --git a/screenlib/SDL_FrameBuf.cpp b/screenlib/SDL_FrameBuf.cpp
index 9e6f1b05..9526d4a2 100644
--- a/screenlib/SDL_FrameBuf.cpp
+++ b/screenlib/SDL_FrameBuf.cpp
@@ -21,7 +21,7 @@
*/
#include <stdio.h>
-#include "physfsrwops.h"
+#include "../utils/physfsrwops.h"
#include "SDL_FrameBuf.h"
diff --git a/screenlib/UIElementLabel.cpp b/screenlib/UIElementLabel.cpp
index e29b641e..6f4484a3 100644
--- a/screenlib/UIElementLabel.cpp
+++ b/screenlib/UIElementLabel.cpp
@@ -1,6 +1,28 @@
-
+/*
+ SCREENLIB: A framebuffer library based on the SDL library
+ Copyright (C) 1997 Sam Lantinga
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Sam Lantinga
+ slouken@libsdl.org
+*/
+
+#include "SDL_FrameBuf.h"
+#include "UIManager.h"
#include "UIElementLabel.h"
-#include "Maelstrom_Globals.h"
UIElementType UIElementLabel::s_elementType;
diff --git a/screenlib/UIElementLine.cpp b/screenlib/UIElementLine.cpp
index e89f0b67..928e8a1d 100644
--- a/screenlib/UIElementLine.cpp
+++ b/screenlib/UIElementLine.cpp
@@ -1,3 +1,24 @@
+/*
+ SCREENLIB: A framebuffer library based on the SDL library
+ Copyright (C) 1997 Sam Lantinga
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Sam Lantinga
+ slouken@libsdl.org
+*/
#include "SDL_FrameBuf.h"
#include "UIElementLine.h"
diff --git a/screenlib/UIElementRect.cpp b/screenlib/UIElementRect.cpp
index 26f28910..445f3bc1 100644
--- a/screenlib/UIElementRect.cpp
+++ b/screenlib/UIElementRect.cpp
@@ -1,3 +1,24 @@
+/*
+ SCREENLIB: A framebuffer library based on the SDL library
+ Copyright (C) 1997 Sam Lantinga
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Sam Lantinga
+ slouken@libsdl.org
+*/
#include "SDL_FrameBuf.h"
#include "UIElementRect.h"
diff --git a/screenlib/UIElementTexture.cpp b/screenlib/UIElementTexture.cpp
index 3c56d1d6..5fe5894b 100644
--- a/screenlib/UIElementTexture.cpp
+++ b/screenlib/UIElementTexture.cpp
@@ -1,6 +1,27 @@
+/*
+ SCREENLIB: A framebuffer library based on the SDL library
+ Copyright (C) 1997 Sam Lantinga
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Sam Lantinga
+ slouken@libsdl.org
+*/
+
+#include "SDL_FrameBuf.h"
#include "UIElementTexture.h"
-#include "screenlib/SDL_FrameBuf.h"
UIElementType UIElementTexture::s_elementType;