[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3185 - in trunk/pingus: . src/input
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3185 - in trunk/pingus: . src/input |
Date: |
Wed, 19 Sep 2007 16:30:16 +0200 |
Author: grumbel
Date: 2007-09-19 16:30:16 +0200 (Wed, 19 Sep 2007)
New Revision: 3185
Removed:
trunk/pingus/config.h
Modified:
trunk/pingus/SConstruct
trunk/pingus/src/input/wiimote.hpp
Log:
- some fixed to SConscript
Modified: trunk/pingus/SConstruct
===================================================================
--- trunk/pingus/SConstruct 2007-09-19 13:58:57 UTC (rev 3184)
+++ trunk/pingus/SConstruct 2007-09-19 14:30:16 UTC (rev 3185)
@@ -180,9 +180,6 @@
'src/input/controller_description.cpp',
'src/input/controller.cpp',
'src/input/core_driver.cpp',
-'src/input/usbmouse_driver.cpp',
-'src/input/wiimote_driver.cpp',
-'src/input/wiimote.cpp',
'src/input/xinput_driver.cpp',
'src/input/xinput_device.cpp',
'src/input/sdl_driver.cpp',
@@ -358,7 +355,8 @@
env['have_cwiid'] = True
env['LIBS'] += ['cwiid']
config_h_defines += [('HAVE_CWIID', 1)]
- env['optional_sources'] += ['src/input/wiimote_driver.cpp']
+ env['optional_sources'] += ['src/input/wiimote_driver.cpp',
+ 'src/input/wiimote.cpp']
if not config.CheckLib('Xi'):
reports += " * XInput support: no (library Xi not found)\n" ## FIXME:
Need to set a define
@@ -368,7 +366,7 @@
env['have_xinput'] = True
env['LIBS'] += ['Xi']
env['optional_sources'] += ['src/input/xinput_driver.cpp',
- 'src/input/xinput_device.cpp']
+ 'src/input/xinput_device.cpp']
if not config.CheckLib('boost_signals'):
fatal_error += " * library 'boost_signals' not found\n"
@@ -394,6 +392,7 @@
config_h = open('config.h', 'w')
config_h.write('#define VERSION "0.7.0"\n')
+config_h.write('#define ICONV_CONST\n') # FIXME: make a check for this
for (v,k) in config_h_defines:
config_h.write('#define %s %s\n' % (v, k))
config_h.close()
Deleted: trunk/pingus/config.h
===================================================================
--- trunk/pingus/config.h 2007-09-19 13:58:57 UTC (rev 3184)
+++ trunk/pingus/config.h 2007-09-19 14:30:16 UTC (rev 3185)
@@ -1 +0,0 @@
-#define VERSION "0.7.0"
Modified: trunk/pingus/src/input/wiimote.hpp
===================================================================
--- trunk/pingus/src/input/wiimote.hpp 2007-09-19 13:58:57 UTC (rev 3184)
+++ trunk/pingus/src/input/wiimote.hpp 2007-09-19 14:30:16 UTC (rev 3185)
@@ -20,8 +20,6 @@
#ifndef HEADER_WIIMOTE_HPP
#define HEADER_WIIMOTE_HPP
-#ifdef HAVE_CWIID
-
#include <vector>
#include "cwiid.h"
@@ -174,8 +172,6 @@
Wiimote& operator=(const Wiimote&);
};
-#endif // HAVE_CWIID
-
class Wiimote;
extern Wiimote* wiimote;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3185 - in trunk/pingus: . src/input,
grumbel at BerliOS <=