summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-06-25 19:59:17 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-06-25 19:59:17 +0200
commitb08a63790c0fbeacb3f96a74e3eb15abe8c70dab (patch)
tree7260140ae1ea308bd256370c6fcbbc57dbd13441 /src/ui
parentf58918031c001a0159eaf8f18d4e451e70089d30 (diff)
downloadcolobot-b08a63790c0fbeacb3f96a74e3eb15abe8c70dab.tar.gz
colobot-b08a63790c0fbeacb3f96a74e3eb15abe8c70dab.tar.bz2
colobot-b08a63790c0fbeacb3f96a74e3eb15abe8c70dab.zip
SDL project
- added (very basic) SDL template in CApplication and CEngine - split project into two targets: colobot_old (dependent on DirectX and WinAPI) and colobot_new (dependent on SDL and OpenGL) - moved sound.h/cpp to old/ and created new template in Snd namespace - added platform-independent dialog boxes in app/system.h/cpp
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/control.cpp2
-rw-r--r--src/ui/displaytext.cpp2
-rw-r--r--src/ui/key.cpp2
-rw-r--r--src/ui/maindialog.cpp2
-rw-r--r--src/ui/studio.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/control.cpp b/src/ui/control.cpp
index 330eacc..525cab2 100644
--- a/src/ui/control.cpp
+++ b/src/ui/control.cpp
@@ -31,7 +31,7 @@
#include "common/misc.h"
#include "common/iman.h"
#include "old/text.h"
-#include "sound/sound.h"
+#include "old/sound.h"
#include "ui/control.h"
diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp
index df08c24..b21d96e 100644
--- a/src/ui/displaytext.cpp
+++ b/src/ui/displaytext.cpp
@@ -36,7 +36,7 @@
#include "ui/window.h"
#include "ui/group.h"
#include "old/text.h"
-#include "sound/sound.h"
+#include "old/sound.h"
#include "ui/displaytext.h"
diff --git a/src/ui/key.cpp b/src/ui/key.cpp
index a581674..941dd8a 100644
--- a/src/ui/key.cpp
+++ b/src/ui/key.cpp
@@ -28,7 +28,7 @@
#include "common/misc.h"
#include "common/iman.h"
#include "common/restext.h"
-#include "sound/sound.h"
+#include "old/sound.h"
#include "old/text.h"
#include "ui/key.h"
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index bc9f5b4..267c4b1 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -52,7 +52,7 @@
#include "ui/editvalue.h"
#include "old/text.h"
#include "old/camera.h"
-#include "sound/sound.h"
+#include "old/sound.h"
#include "script/cmdtoken.h"
#include "object/robotmain.h"
#include "ui/maindialog.h"
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp
index b9f8d95..d37c6fd 100644
--- a/src/ui/studio.cpp
+++ b/src/ui/studio.cpp
@@ -38,7 +38,7 @@
#include "object/robotmain.h"
#include "object/object.h"
#include "old/camera.h"
-#include "sound/sound.h"
+#include "old/sound.h"
#include "script/script.h"
#include "ui/interface.h"
#include "ui/button.h"