Changeset 1021 for code/trunk/src/util

Timestamp:

Apr 10, 2008, 5:03:34 PM (17 years ago)

Author:

bknecht

Message:

merged back that script-branch

Location:

code/trunk/src/util

Files:

• CMakeLists.txt (modified) (2 diffs)
• Sleep.h (modified) (1 diff)
• tolua (copied) (copied from code/branches/script/src/util/tolua)
• tolua/tolua++.h (copied) (copied from code/branches/script/src/util/tolua/tolua++.h)
• tolua/tolua.c (copied) (copied from code/branches/script/src/util/tolua/tolua.c)
• tolua/tolua.pkg (copied) (copied from code/branches/script/src/util/tolua/tolua.pkg)
• tolua/tolua_bind.cc (copied) (copied from code/branches/script/src/util/tolua/tolua_bind.cc)
• tolua/tolua_bind.h (copied) (copied from code/branches/script/src/util/tolua/tolua_bind.h)
• tolua/tolua_event.c (copied) (copied from code/branches/script/src/util/tolua/tolua_event.c)
• tolua/tolua_event.h (copied) (copied from code/branches/script/src/util/tolua/tolua_event.h)
• tolua/tolua_is.c (copied) (copied from code/branches/script/src/util/tolua/tolua_is.c)
• tolua/tolua_map.c (copied) (copied from code/branches/script/src/util/tolua/tolua_map.c)
• tolua/tolua_push.c (copied) (copied from code/branches/script/src/util/tolua/tolua_push.c)
• tolua/tolua_to.c (copied) (copied from code/branches/script/src/util/tolua/tolua_to.c)
• tolua/toluabind.c (copied) (copied from code/branches/script/src/util/tolua/toluabind.c)
• tolua/toluabind.h (copied) (copied from code/branches/script/src/util/tolua/toluabind.h)
• tolua/toluabind_default.h (copied) (copied from code/branches/script/src/util/tolua/toluabind_default.h)

code/trunk/src/util/CMakeLists.txt

@@ -2 +2 @@
 
 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
+AUX_SOURCE_DIRECTORY(tolua TOLUA_SRC_FILES)
 
 SET (UTIL_SRC_FILES
@@ -11 +12 @@
   MultiTypeMath.cc
   ${TINYXML_SRC_FILES}
+  ${TOLUA_SRC_FILES}
 )
 

code/trunk/src/util/Sleep.h

@@ -1 @@
-// hack for the usleep/Sleep problem
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+/**
+ @file  Sleep.h
+ @brief Macros for using sleep() and usleep() under windows
+ */
+
+#include "OrxonoxPlatform.h"
+
+#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
 #  include <windows.h>
-#  define usleep(x) Sleep((x)/1000)
+#  define usleep(x) Sleep((x) / 1000)
+#  define msleep(x) Sleep(x)
+#  define  sleep(x) Sleep((x) * 1000)
 #else
 #  include <unistd.h>
+#  define msleep(x) uleep((x) * 1000)
 #endif