Commit cb23e988 authored by IOhannes m zmölnig's avatar IOhannes m zmölnig
Browse files

do not check for gdi32/ws2_32

trouble is, that the functions we are using are "__stdcall" functions,
which are heavily decorated, and autotools is nice for checking __cdecl functions.

https://lists.gnu.org/archive/html/autoconf/2013-12/msg00019.html
> Normal practice for Windows ports is to simply assume that the
> requisite libraries are always present.
parent f0cad68a
......@@ -234,13 +234,6 @@ AC_CHECK_LIB([dl],[dlopen])
AC_CHECK_LIB([msvcrt], [fclose])
## Standard C++ Libray:
#AC_CHECK_LIB([msvcprt], [main])
# Winsock Library
AC_CHECK_LIB([ws2_32], [main])
AC_CHECK_LIB([wsock32], [select])
# w32 window creating
AC_CHECK_LIB([gdi32], [main])
## on OSX X shouldn't be used by default as there are other ways
## however, if people really want it ("--with-x") they should get it
......
......@@ -32,6 +32,9 @@ libBase_la_LIBADD += $(GEM_LIB_GLEWMX_LIBS)
else !ENABLE_MULTICONTEXT
libBase_la_CXXFLAGS += $(GEM_LIB_GLEW_CFLAGS)
libBase_la_LIBADD += $(GEM_LIB_GLEW_LIBS)
if WINDOWS
libBase_la_LIBADD += -lgdi32
endif
endif !ENABLE_MULTICONTEXT
# FTGL
......
......@@ -296,6 +296,9 @@ gemw32window_la_LDFLAGS += @GL_LDFLAGS@
## QuickTime support
#gemw32window_la_CXXFLAGS += $(GEM_FRAMEWORK_QUICKTIME_CFLAGS)
#gemw32window_la_LIBADD += $(GEM_FRAMEWORK_QUICKTIME_LIBS)
if WINDOWS
gemw32window_la_LIBADD += -lgdi32
endif
## SOURCES
gemw32window_la_SOURCES = \
......
......@@ -22,6 +22,9 @@ libUtils_la_LDFLAGS += $(GEM_ARCH_LDFLAGS)
libUtils_la_CXXFLAGS += $(GEM_LIB_FRIBIDI_CFLAGS)
libUtils_la_LIBADD += $(GEM_LIB_FRIBIDI_LIBS)
if WINDOWS
libUtils_la_LIBADD += -lws2_32
endif
libUtils_la_includedir = $(includedir)/Gem/Utils
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment