Commit c3c0cd45 authored by keller's avatar keller
Browse files

[project @ 2001-12-04 04:54:26 by keller]

Sets the X11 C compiler and linker flags for package xlib correctly now
parent 51e20412
...@@ -22,7 +22,11 @@ PKGCONF_OPTS = "$(TARGETPLATFORM)" \ ...@@ -22,7 +22,11 @@ PKGCONF_OPTS = "$(TARGETPLATFORM)" \
"$(GHC_LIB_DIR)" \ "$(GHC_LIB_DIR)" \
"$(GHC_RUNTIME_DIR)" \ "$(GHC_RUNTIME_DIR)" \
"$(GHC_UTILS_DIR)" \ "$(GHC_UTILS_DIR)" \
"$(GHC_INCLUDE_DIR)" "$(GHC_INCLUDE_DIR)" \
"$(X_CFLAGS)" \
"$(X_LIBS)"
# the latter two are needed to setup the package details for hslibs/xlib
SRC_HC_OPTS += -fglasgow-exts -cpp SRC_HC_OPTS += -fglasgow-exts -cpp
......
...@@ -35,6 +35,8 @@ package_details installing ...@@ -35,6 +35,8 @@ package_details installing
, cGHC_RUNTIME_DIR , cGHC_RUNTIME_DIR
, cGHC_UTILS_DIR , cGHC_UTILS_DIR
, cGHC_INCLUDE_DIR , cGHC_INCLUDE_DIR
, cX_CFLAGS
, cX_LIBS
] = ] =
[ [
...@@ -427,8 +429,8 @@ package_details installing ...@@ -427,8 +429,8 @@ package_details installing
c_includes = [ "HsXlib.h" ], c_includes = [ "HsXlib.h" ],
package_deps = [ "greencard" ], package_deps = [ "greencard" ],
extra_ghc_opts = [], extra_ghc_opts = [],
extra_cc_opts = [], extra_cc_opts = [ cX_CFLAGS ],
extra_ld_opts = [] extra_ld_opts = [ cX_LIBS ]
} }
,Package { ,Package {
...@@ -437,7 +439,9 @@ package_details installing ...@@ -437,7 +439,9 @@ package_details installing
then [ "$libdir/imports/HGL" ] then [ "$libdir/imports/HGL" ]
else [ "$libdir/hslibs/graphics/lib/x11" ], else [ "$libdir/hslibs/graphics/lib/x11" ],
source_dirs = [], source_dirs = [],
library_dirs = [], library_dirs = if installing
then [ "$libdir" ]
else [ "$libdir/hslibs/graphics/lib/x11"],
hs_libraries = [ "HSHGL" ], hs_libraries = [ "HSHGL" ],
extra_libraries= [], extra_libraries= [],
include_dirs = [], include_dirs = [],
......
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