Skip to content

Commit 11de7ba

Browse files
committed
Revert "Workaround against undefined SDL_PollEvents reference for windows build"
This reverts commit 741f37c.
1 parent 741f37c commit 11de7ba

3 files changed

Lines changed: 2 additions & 13 deletions

File tree

projects/unix/buildwin32.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ UNAME=MINGW32
55
DESTDIR=./dist_win32
66

77
HID_CFLAGS="-I $HIDHOME/hidapi"
8-
HID_LDLIBS="-L $HIDHOME/windows/.libs/ -lhidapi sdl.lib"
8+
HID_LDLIBS="-L $HIDHOME/windows/.libs/ -lhidapi"
99
TARGETS=all
1010
MAKEFILE=Makefile
1111

@@ -14,10 +14,6 @@ if [ $? -ne 0 ]; then
1414
exit 1
1515
fi
1616

17-
# Hack to let this project link without requiring libsdl. Without
18-
# this linking will fail due to a missing symbol (SDL_PumpEvents)
19-
i686-w64-mingw32-dlltool -d sdl.def -l sdl.lib
20-
2117
make -f $MAKEFILE CROSS_COMPILE=i686-w64-mingw32- UNAME=$UNAME HID_CFLAGS="$HID_CFLAGS" HID_LDLIBS="$HID_LDLIBS" $TARGETS V=1
2218
if [ $? -ne 0 ]; then
2319
exit 1

projects/unix/buildwin64.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ UNAME=MINGW64
55
DESTDIR=./dist_win64
66

77
HID_CFLAGS="-I $HIDHOME/hidapi"
8-
HID_LDLIBS="-L $HIDHOME/windows/.libs/ -lhidapi sdl.lib"
8+
HID_LDLIBS="-L $HIDHOME/windows/.libs/ -lhidapi"
99
TARGETS=all
1010
MAKEFILE=Makefile
1111

@@ -14,10 +14,6 @@ if [ $? -ne 0 ]; then
1414
exit 1
1515
fi
1616

17-
# Hack to let this project link without requiring libsdl. Without
18-
# this linking will fail due to a missing symbol (SDL_PumpEvents)
19-
x86_64-w64-mingw32-dlltool -d sdl.def -l sdl.lib
20-
2117
make -f $MAKEFILE CROSS_COMPILE=x86_64-w64-mingw32- UNAME=$UNAME HID_CFLAGS="$HID_CFLAGS" HID_LDLIBS="$HID_LDLIBS" $TARGETS V=1
2218
if [ $? -ne 0 ]; then
2319
exit 1

projects/unix/sdl.def

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)