From 4ecca10a88247545a7e130a18f331094d527a5e4 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sun, 23 Oct 2011 00:40:22 -0400
Subject: [PATCH] The texture element is a core UI element
---
Makefile.am | 2 --
UIElementTitle.h | 2 +-
screenlib/Makefile.am | 2 ++
UIElementTexture.cpp => screenlib/UIElementTexture.cpp | 0
UIElementTexture.h => screenlib/UIElementTexture.h | 0
5 files changed, 3 insertions(+), 3 deletions(-)
rename UIElementTexture.cpp => screenlib/UIElementTexture.cpp (100%)
rename UIElementTexture.h => screenlib/UIElementTexture.h (100%)
diff --git a/Makefile.am b/Makefile.am
index 1722fb99..502269ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,6 @@ Maelstrom_SOURCES = \
rect.h \
scores.cpp \
scores.h \
- UIElementTexture.cpp \
- UIElementTexture.h \
UIElementTitle.cpp \
UIElementTitle.h \
UIElements.cpp \
diff --git a/UIElementTitle.h b/UIElementTitle.h
index 6a29782c..f095d74a 100644
--- a/UIElementTitle.h
+++ b/UIElementTitle.h
@@ -1,7 +1,7 @@
#ifndef _UIElementTitle_h
#define _UIElementTitle_h
-#include "UIElementTexture.h"
+#include "screenlib/UIElementTexture.h"
class UIElementTitle : public UIElementTexture
diff --git a/screenlib/Makefile.am b/screenlib/Makefile.am
index 55b629de..02e7b18b 100644
--- a/screenlib/Makefile.am
+++ b/screenlib/Makefile.am
@@ -9,6 +9,8 @@ libSDLscreen_a_SOURCES = \
UIArea.h \
UIElement.cpp \
UIElement.h \
+ UIElementTexture.cpp \
+ UIElementTexture.h \
UIManager.cpp \
UIManager.h \
UIPanel.cpp \
diff --git a/UIElementTexture.cpp b/screenlib/UIElementTexture.cpp
similarity index 100%
rename from UIElementTexture.cpp
rename to screenlib/UIElementTexture.cpp
diff --git a/UIElementTexture.h b/screenlib/UIElementTexture.h
similarity index 100%
rename from UIElementTexture.h
rename to screenlib/UIElementTexture.h