Remove Win32 library dependency.
{-# OPTIONS -fglasgow-exts #-}
-----------------------------------------------------------------------------
{-# OPTIONS -fglasgow-exts #-}
-----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.28 2002/09/13 15:01:40 simonpj Exp $
+-- $Id: Main.hs,v 1.29 2002/10/27 10:38:32 mthomas Exp $
--
-- Package management tool
-----------------------------------------------------------------------------
--
-- Package management tool
-----------------------------------------------------------------------------
#include "../../includes/config.h"
#ifdef mingw32_HOST_OS
#include "../../includes/config.h"
#ifdef mingw32_HOST_OS
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.18 2002/09/09 11:32:38 simonmar Exp $
+# $Id: Makefile,v 1.19 2002/10/27 10:38:33 mthomas Exp $
TOP=../..
include $(TOP)/mk/boilerplate.mk
TOP=../..
include $(TOP)/mk/boilerplate.mk
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
HS_PROG = ghc-pkg.exe
INSTALL_PROGS += $(HS_PROG)
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
HS_PROG = ghc-pkg.exe
INSTALL_PROGS += $(HS_PROG)
-SRC_HC_OPTS += -package win32
+SRC_HC_OPTS += -fglasgow-exts '-\#include <process.h>' -optl "-Wl,-lkernel32"
endif
# -----------------------------------------------------------------------------
endif
# -----------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
--- $Id: Main.hs,v 1.40 2002/09/09 11:39:42 simonmar Exp $
+-- $Id: Main.hs,v 1.41 2002/10/27 10:38:33 mthomas Exp $
--
-- Program for converting .hsc files to .hs files, by converting the
-- file into a C program which is run to generate the Haskell source.
--
-- Program for converting .hsc files to .hs files, by converting the
-- file into a C program which is run to generate the Haskell source.
#include "../../includes/config.h"
#ifdef mingw32_HOST_OS
#include "../../includes/config.h"
#ifdef mingw32_HOST_OS
+-- import Win32DLL
+import Foreign.C.String (CString, peekCString)
+import Foreign.C.Types
+import Foreign.Ptr (nullPtr)
+import Foreign.Marshal.Alloc (mallocBytes, free)
+
+foreign import stdcall "GetModuleHandle" c_GetModuleHandle :: CString -> IO CUInt
+foreign import stdcall "GetModuleFileName" c_GetModuleFilename :: CUInt -> CString -> CUInt -> IO CUInt
+
+ourName :: IO String
+ourName = do h <- c_GetModuleHandle nullPtr
+ cstr <- mallocBytes cstr_len
+ rv <- c_GetModuleFilename h cstr (CUInt (fromIntegral cstr_len))
+ str <- peekCString cstr
+ free cstr
+ return str
+ where cstr_len = 512
args <- getArgs
let opts@(flags, files, errs) = getOpt Permute options args
#ifdef mingw32_HOST_OS
args <- getArgs
let opts@(flags, files, errs) = getOpt Permute options args
#ifdef mingw32_HOST_OS
- h <- getModuleHandle Nothing
- n <- getModuleFileName h
let tempName = reverse (drop (length "\\bin\\hsc2hs.exe") (reverse n)) ++ "\\template-hsc.h"
let fflags = if [t | Template t <- flags] /= [] then flags else (Template tempName) : flags
let opts = (fflags, files, errs)
let tempName = reverse (drop (length "\\bin\\hsc2hs.exe") (reverse n)) ++ "\\template-hsc.h"
let fflags = if [t | Template t <- flags] /= [] then flags else (Template tempName) : flags
let opts = (fflags, files, errs)
intToDigit (ord c `quot` 64),
intToDigit (ord c `quot` 8 `mod` 8),
intToDigit (ord c `mod` 8)]
intToDigit (ord c `quot` 64),
intToDigit (ord c `quot` 8 `mod` 8),
intToDigit (ord c `mod` 8)]
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.34 2002/09/09 11:39:43 simonmar Exp $
+# $Id: Makefile,v 1.35 2002/10/27 10:38:33 mthomas Exp $
TOP=../..
include $(TOP)/mk/boilerplate.mk
TOP=../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -cpp
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
SRC_HC_OPTS += -cpp
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -package win32 '-\#include <process.h>'
+SRC_HC_OPTS += -fglasgow-exts '-\#include <process.h>' -optl "-Wl,-lkernel32"
endif
ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
endif
ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"