瀏覽代碼

Fix linux build

Daniele Bartolini 11 年之前
父節點
當前提交
f189a724dd
共有 2 個文件被更改,包括 11 次插入7 次删除
  1. 1 1
      engine/lua/lua_environment.cpp
  2. 10 6
      engine/os/linux/main.cpp

+ 1 - 1
engine/lua/lua_environment.cpp

@@ -151,7 +151,7 @@ void LuaEnvironment::call_global(const char* func, uint8_t argc, ...)
 		{
 			case ARGUMENT_FLOAT:
 			{
-				stack.push_float(va_arg(vl, float));
+				stack.push_float(va_arg(vl, double));
 				break;
 			}
 			default:

+ 10 - 6
engine/os/linux/main.cpp

@@ -24,18 +24,22 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/Xrandr.h>
 #include "config.h"
-#include "crown.h"
 #include "device.h"
 #include "os_types.h"
 #include "os_event_queue.h"
 #include "bundle_compiler.h"
 #include "memory.h"
+#include "json_parser.h"
+#include "log.h"
+#include "args.h"
+#include "thread.h"
+#include "os_window.h"
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#include <X11/XKBlib.h>
+#include <X11/extensions/Xrandr.h>
 
 namespace crown
 {