Skip to content

Commit

Permalink
Windows: Latest Binaries
Browse files Browse the repository at this point in the history
  • Loading branch information
malkia committed Apr 18, 2012
1 parent 313eb9a commit e9ffcee
Show file tree
Hide file tree
Showing 116 changed files with 1,269 additions and 166 deletions.
3 changes: 3 additions & 0 deletions README
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ Some of the bindings included are:
To fire up quickly a sample, please do: To fire up quickly a sample, please do:
./luajit samples/intro.lua (uses SDL) ./luajit samples/intro.lua (uses SDL)


To create a world-map .pdf, .svg and .png using cairo
./luajit samples/cairo/world-map.lua

Some more: Some more:
./luajit samples/glfw/moar.lua (uses OpenGL, glu, GLFW) ./luajit samples/glfw/moar.lua (uses OpenGL, glu, GLFW)
./luajit samples/AntTweakBar/simple.lua (AntTweakBar, others) ./luajit samples/AntTweakBar/simple.lua (AntTweakBar, others)
Expand Down
1 change: 1 addition & 0 deletions bin/README
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ organized per operating system ($OS), then architecture ($ARCH), like this:
- Linux (i386, x864_64, armv7l. Tested with 11.04 (x86), and Ubuntu 10.10 (arvm7l - efika mx)) - Linux (i386, x864_64, armv7l. Tested with 11.04 (x86), and Ubuntu 10.10 (arvm7l - efika mx))
- Android (arm) - Compiler right now using android-ndk-r6 for Android 2.2 (platform-8) - Android (arm) - Compiler right now using android-ndk-r6 for Android 2.2 (platform-8)
- webOS HP TouchPad for now - webOS HP TouchPad for now
- bbx BlackBerry PlayBook


Architecutures: Architecutures:
- x86 (i386) - x86 (i386)
Expand Down
Binary file modified bin/Windows/x64/apr.dll
Binary file not shown.
Binary file modified bin/Windows/x64/apr.lib
Binary file not shown.
Binary file modified bin/Windows/x64/apr.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/cairo.dll
Binary file not shown.
Binary file modified bin/Windows/x64/cairo.lib
Binary file not shown.
Binary file modified bin/Windows/x64/cairo.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/expat.dll
Binary file not shown.
Binary file modified bin/Windows/x64/expat.lib
Binary file not shown.
Binary file modified bin/Windows/x64/expat.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/freetype2.dll
Binary file not shown.
Binary file modified bin/Windows/x64/freetype2.lib
Binary file not shown.
Binary file modified bin/Windows/x64/freetype2.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/glfw.dll
Binary file not shown.
Binary file modified bin/Windows/x64/glfw.lib
Binary file not shown.
Binary file modified bin/Windows/x64/glfw.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/http-parser.dll
Binary file not shown.
Binary file modified bin/Windows/x64/http-parser.lib
Binary file not shown.
Binary file modified bin/Windows/x64/http-parser.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/lua51.dll
Binary file not shown.
Binary file modified bin/Windows/x64/lua51.lib
Binary file not shown.
Binary file modified bin/Windows/x64/lua51.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/lua51_static.lib
Binary file not shown.
Binary file modified bin/Windows/x64/luajit.exe
Binary file not shown.
Binary file modified bin/Windows/x64/luajit.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/pixman.dll
Binary file not shown.
Binary file modified bin/Windows/x64/pixman.lib
Binary file not shown.
Binary file modified bin/Windows/x64/pixman.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/png.dll
Binary file not shown.
Binary file modified bin/Windows/x64/png.lib
Binary file not shown.
Binary file modified bin/Windows/x64/png.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/tcl.dll
Binary file not shown.
Binary file modified bin/Windows/x64/tcl.lib
Binary file not shown.
Binary file modified bin/Windows/x64/tcl.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/tk.dll
Binary file not shown.
Binary file modified bin/Windows/x64/tk.lib
Binary file not shown.
Binary file modified bin/Windows/x64/tk.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/uv.dll
Binary file not shown.
Binary file modified bin/Windows/x64/uv.lib
Binary file not shown.
Binary file modified bin/Windows/x64/uv.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/z.dll
Binary file not shown.
Binary file modified bin/Windows/x64/z.lib
Binary file not shown.
Binary file modified bin/Windows/x64/z.pdb
Binary file not shown.
Binary file modified bin/Windows/x64/zmq.dll
Binary file not shown.
Binary file modified bin/Windows/x64/zmq.lib
Binary file not shown.
Binary file modified bin/Windows/x64/zmq.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/apr.dll
Binary file not shown.
Binary file modified bin/Windows/x86/apr.lib
Binary file not shown.
Binary file modified bin/Windows/x86/apr.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/cairo.dll
Binary file not shown.
Binary file modified bin/Windows/x86/cairo.lib
Binary file not shown.
Binary file modified bin/Windows/x86/cairo.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/expat.dll
Binary file not shown.
Binary file modified bin/Windows/x86/expat.lib
Binary file not shown.
Binary file modified bin/Windows/x86/expat.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/freetype2.dll
Binary file not shown.
Binary file modified bin/Windows/x86/freetype2.lib
Binary file not shown.
Binary file modified bin/Windows/x86/freetype2.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/glfw.dll
Binary file not shown.
Binary file modified bin/Windows/x86/glfw.lib
Binary file not shown.
Binary file modified bin/Windows/x86/glfw.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/http-parser.dll
Binary file not shown.
Binary file modified bin/Windows/x86/http-parser.lib
Binary file not shown.
Binary file modified bin/Windows/x86/http-parser.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/lua51.dll
Binary file not shown.
Binary file modified bin/Windows/x86/lua51.lib
Binary file not shown.
Binary file modified bin/Windows/x86/lua51.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/lua51_static.lib
Binary file not shown.
Binary file modified bin/Windows/x86/luajit.exe
Binary file not shown.
Binary file modified bin/Windows/x86/luajit.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/pixman.dll
Binary file not shown.
Binary file modified bin/Windows/x86/pixman.lib
Binary file not shown.
Binary file modified bin/Windows/x86/pixman.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/png.dll
Binary file not shown.
Binary file modified bin/Windows/x86/png.lib
Binary file not shown.
Binary file modified bin/Windows/x86/png.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/tcl.dll
Binary file not shown.
Binary file modified bin/Windows/x86/tcl.lib
Binary file not shown.
Binary file modified bin/Windows/x86/tcl.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/tk.dll
Binary file not shown.
Binary file modified bin/Windows/x86/tk.lib
Binary file not shown.
Binary file modified bin/Windows/x86/tk.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/uv.dll
Binary file not shown.
Binary file modified bin/Windows/x86/uv.lib
Binary file not shown.
Binary file modified bin/Windows/x86/uv.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/z.dll
Binary file not shown.
Binary file modified bin/Windows/x86/z.lib
Binary file not shown.
Binary file modified bin/Windows/x86/z.pdb
Binary file not shown.
Binary file modified bin/Windows/x86/zmq.dll
Binary file not shown.
Binary file modified bin/Windows/x86/zmq.lib
Binary file not shown.
Binary file modified bin/Windows/x86/zmq.pdb
Binary file not shown.
1 change: 1 addition & 0 deletions build/Windows/cairo.cmd
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pushd %LB_PROJECT_ROOT%
setlocal setlocal


git clean -fdx git clean -fdx
rem git checkout 1.12.0


set DEBUG_RELEASE=release set DEBUG_RELEASE=release


Expand Down
2 changes: 1 addition & 1 deletion build/Windows/glfw.cmd
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set FILES=^
win32_dllmain.c win32_fullscreen.c win32_gamma.c win32_init.c win32_input.c^ win32_dllmain.c win32_fullscreen.c win32_gamma.c win32_init.c win32_input.c^
win32_joystick.c win32_opengl.c win32_time.c win32_window.c window.c win32_joystick.c win32_opengl.c win32_time.c win32_window.c window.c


cl %LB_CL_OPTS% -Fe%NAME%.dll -LD -DGLFW_BUILD_DLL=1 %FILES%^ cl %LB_CL_OPTS% -Fe%NAME%.dll -LD -D_GLFW_BUILD_DLL=1 %FILES%^
/link"%LB_LINK_OPTS% user32.lib opengl32.lib gdi32.lib winmm.lib" /link"%LB_LINK_OPTS% user32.lib opengl32.lib gdi32.lib winmm.lib"


call %~dp0/wdk/install %NAME%.dll call %~dp0/wdk/install %NAME%.dll
Expand Down
40 changes: 40 additions & 0 deletions build/Windows/glfw.diff
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,40 @@
diff --git a/src/win32_joystick.c b/src/win32_joystick.c
index 9fad300..155f8fe 100644
--- a/src/win32_joystick.c
+++ b/src/win32_joystick.c
@@ -80,6 +80,7 @@ static float calcJoystickPos(DWORD pos, DWORD min, DWORD max)
int _glfwPlatformGetJoystickParam(int joy, int param)
{
JOYCAPS jc;
+ int hats;

if (!isJoystickPresent(joy))
return 0;
@@ -91,7 +92,7 @@ int _glfwPlatformGetJoystickParam(int joy, int param)
// Get joystick capabilities
_glfw_joyGetDevCaps(joy - GLFW_JOYSTICK_1, &jc, sizeof(JOYCAPS));

- const int hats = (jc.wCaps & JOYCAPS_HASPOV) && (jc.wCaps & JOYCAPS_POV4DIR) ? 1 : 0;
+ hats = (jc.wCaps & JOYCAPS_HASPOV) && (jc.wCaps & JOYCAPS_POV4DIR) ? 1 : 0;

switch (param)
{
@@ -167,6 +168,8 @@ int _glfwPlatformGetJoystickButtons(int joy, unsigned char* buttons,
JOYCAPS jc;
JOYINFOEX ji;
int button;
+ int hats;
+ static const int directions[9] = { 1, 3, 2, 6, 4, 12, 8, 9, 0 }; // Bit fields of button presses for each direction, including nil

if (!isJoystickPresent(joy))
return 0;
@@ -190,8 +193,7 @@ int _glfwPlatformGetJoystickButtons(int joy, unsigned char* buttons,
// Each hat is exposed as 4 buttons which exposes 8 directions with concurrent button presses
// (Note: This API only exposes one hat)

- const int hats = (jc.wCaps & JOYCAPS_HASPOV) && (jc.wCaps & JOYCAPS_POV4DIR) ? 1 : 0;
- const int directions[9] = { 1, 3, 2, 6, 4, 12, 8, 9, 0 }; // Bit fields of button presses for each direction, including nil
+ hats = (jc.wCaps & JOYCAPS_HASPOV) && (jc.wCaps & JOYCAPS_POV4DIR) ? 1 : 0;

if (hats > 0)
{
305 changes: 305 additions & 0 deletions build/Windows/include/inttypes.h
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,305 @@
// ISO C9x compliant inttypes.h for Microsoft Visual Studio
// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
//
// Copyright (c) 2006 Alexander Chemeris
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// 3. The name of the author may be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
///////////////////////////////////////////////////////////////////////////////

#ifndef _MSC_VER // [
#error "Use this header only with Microsoft Visual C++ compilers!"
#endif // _MSC_VER ]

#ifndef _MSC_INTTYPES_H_ // [
#define _MSC_INTTYPES_H_

#if _MSC_VER > 1000
#pragma once
#endif

#include "stdint.h"

// 7.8 Format conversion of integer types

typedef struct {
intmax_t quot;
intmax_t rem;
} imaxdiv_t;

// 7.8.1 Macros for format specifiers

#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198

// The fprintf macros for signed integers are:
#define PRId8 "d"
#define PRIi8 "i"
#define PRIdLEAST8 "d"
#define PRIiLEAST8 "i"
#define PRIdFAST8 "d"
#define PRIiFAST8 "i"

#define PRId16 "hd"
#define PRIi16 "hi"
#define PRIdLEAST16 "hd"
#define PRIiLEAST16 "hi"
#define PRIdFAST16 "hd"
#define PRIiFAST16 "hi"

#define PRId32 "I32d"
#define PRIi32 "I32i"
#define PRIdLEAST32 "I32d"
#define PRIiLEAST32 "I32i"
#define PRIdFAST32 "I32d"
#define PRIiFAST32 "I32i"

#define PRId64 "I64d"
#define PRIi64 "I64i"
#define PRIdLEAST64 "I64d"
#define PRIiLEAST64 "I64i"
#define PRIdFAST64 "I64d"
#define PRIiFAST64 "I64i"

#define PRIdMAX "I64d"
#define PRIiMAX "I64i"

#define PRIdPTR "Id"
#define PRIiPTR "Ii"

// The fprintf macros for unsigned integers are:
#define PRIo8 "o"
#define PRIu8 "u"
#define PRIx8 "x"
#define PRIX8 "X"
#define PRIoLEAST8 "o"
#define PRIuLEAST8 "u"
#define PRIxLEAST8 "x"
#define PRIXLEAST8 "X"
#define PRIoFAST8 "o"
#define PRIuFAST8 "u"
#define PRIxFAST8 "x"
#define PRIXFAST8 "X"

#define PRIo16 "ho"
#define PRIu16 "hu"
#define PRIx16 "hx"
#define PRIX16 "hX"
#define PRIoLEAST16 "ho"
#define PRIuLEAST16 "hu"
#define PRIxLEAST16 "hx"
#define PRIXLEAST16 "hX"
#define PRIoFAST16 "ho"
#define PRIuFAST16 "hu"
#define PRIxFAST16 "hx"
#define PRIXFAST16 "hX"

#define PRIo32 "I32o"
#define PRIu32 "I32u"
#define PRIx32 "I32x"
#define PRIX32 "I32X"
#define PRIoLEAST32 "I32o"
#define PRIuLEAST32 "I32u"
#define PRIxLEAST32 "I32x"
#define PRIXLEAST32 "I32X"
#define PRIoFAST32 "I32o"
#define PRIuFAST32 "I32u"
#define PRIxFAST32 "I32x"
#define PRIXFAST32 "I32X"

#define PRIo64 "I64o"
#define PRIu64 "I64u"
#define PRIx64 "I64x"
#define PRIX64 "I64X"
#define PRIoLEAST64 "I64o"
#define PRIuLEAST64 "I64u"
#define PRIxLEAST64 "I64x"
#define PRIXLEAST64 "I64X"
#define PRIoFAST64 "I64o"
#define PRIuFAST64 "I64u"
#define PRIxFAST64 "I64x"
#define PRIXFAST64 "I64X"

#define PRIoMAX "I64o"
#define PRIuMAX "I64u"
#define PRIxMAX "I64x"
#define PRIXMAX "I64X"

#define PRIoPTR "Io"
#define PRIuPTR "Iu"
#define PRIxPTR "Ix"
#define PRIXPTR "IX"

// The fscanf macros for signed integers are:
#define SCNd8 "d"
#define SCNi8 "i"
#define SCNdLEAST8 "d"
#define SCNiLEAST8 "i"
#define SCNdFAST8 "d"
#define SCNiFAST8 "i"

#define SCNd16 "hd"
#define SCNi16 "hi"
#define SCNdLEAST16 "hd"
#define SCNiLEAST16 "hi"
#define SCNdFAST16 "hd"
#define SCNiFAST16 "hi"

#define SCNd32 "ld"
#define SCNi32 "li"
#define SCNdLEAST32 "ld"
#define SCNiLEAST32 "li"
#define SCNdFAST32 "ld"
#define SCNiFAST32 "li"

#define SCNd64 "I64d"
#define SCNi64 "I64i"
#define SCNdLEAST64 "I64d"
#define SCNiLEAST64 "I64i"
#define SCNdFAST64 "I64d"
#define SCNiFAST64 "I64i"

#define SCNdMAX "I64d"
#define SCNiMAX "I64i"

#ifdef _WIN64 // [
# define SCNdPTR "I64d"
# define SCNiPTR "I64i"
#else // _WIN64 ][
# define SCNdPTR "ld"
# define SCNiPTR "li"
#endif // _WIN64 ]

// The fscanf macros for unsigned integers are:
#define SCNo8 "o"
#define SCNu8 "u"
#define SCNx8 "x"
#define SCNX8 "X"
#define SCNoLEAST8 "o"
#define SCNuLEAST8 "u"
#define SCNxLEAST8 "x"
#define SCNXLEAST8 "X"
#define SCNoFAST8 "o"
#define SCNuFAST8 "u"
#define SCNxFAST8 "x"
#define SCNXFAST8 "X"

#define SCNo16 "ho"
#define SCNu16 "hu"
#define SCNx16 "hx"
#define SCNX16 "hX"
#define SCNoLEAST16 "ho"
#define SCNuLEAST16 "hu"
#define SCNxLEAST16 "hx"
#define SCNXLEAST16 "hX"
#define SCNoFAST16 "ho"
#define SCNuFAST16 "hu"
#define SCNxFAST16 "hx"
#define SCNXFAST16 "hX"

#define SCNo32 "lo"
#define SCNu32 "lu"
#define SCNx32 "lx"
#define SCNX32 "lX"
#define SCNoLEAST32 "lo"
#define SCNuLEAST32 "lu"
#define SCNxLEAST32 "lx"
#define SCNXLEAST32 "lX"
#define SCNoFAST32 "lo"
#define SCNuFAST32 "lu"
#define SCNxFAST32 "lx"
#define SCNXFAST32 "lX"

#define SCNo64 "I64o"
#define SCNu64 "I64u"
#define SCNx64 "I64x"
#define SCNX64 "I64X"
#define SCNoLEAST64 "I64o"
#define SCNuLEAST64 "I64u"
#define SCNxLEAST64 "I64x"
#define SCNXLEAST64 "I64X"
#define SCNoFAST64 "I64o"
#define SCNuFAST64 "I64u"
#define SCNxFAST64 "I64x"
#define SCNXFAST64 "I64X"

#define SCNoMAX "I64o"
#define SCNuMAX "I64u"
#define SCNxMAX "I64x"
#define SCNXMAX "I64X"

#ifdef _WIN64 // [
# define SCNoPTR "I64o"
# define SCNuPTR "I64u"
# define SCNxPTR "I64x"
# define SCNXPTR "I64X"
#else // _WIN64 ][
# define SCNoPTR "lo"
# define SCNuPTR "lu"
# define SCNxPTR "lx"
# define SCNXPTR "lX"
#endif // _WIN64 ]

#endif // __STDC_FORMAT_MACROS ]

// 7.8.2 Functions for greatest-width integer types

// 7.8.2.1 The imaxabs function
#define imaxabs _abs64

// 7.8.2.2 The imaxdiv function

// This is modified version of div() function from Microsoft's div.c found
// in %MSVC.NET%\crt\src\div.c
#ifdef STATIC_IMAXDIV // [
static
#else // STATIC_IMAXDIV ][
_inline
#endif // STATIC_IMAXDIV ]
imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
{
imaxdiv_t result;

result.quot = numer / denom;
result.rem = numer % denom;

if (numer < 0 && result.rem > 0) {
// did division wrong; must fix up
++result.quot;
result.rem -= denom;
}

return result;
}

// 7.8.2.3 The strtoimax and strtoumax functions
#define strtoimax _strtoi64
#define strtoumax _strtoui64

// 7.8.2.4 The wcstoimax and wcstoumax functions
#define wcstoimax _wcstoi64
#define wcstoumax _wcstoui64


#endif // _MSC_INTTYPES_H_ ]
10 changes: 10 additions & 0 deletions build/Windows/include/stdbool.h
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,10 @@
#ifndef _STDBOOL_H
#define _STDBOOL_H

/* ISOC99 boolean */

typedef unsigned int bool;
#define true 1
#define false 0

#endif /* _STDBOOL_H */
Loading

0 comments on commit e9ffcee

Please sign in to comment.