diff --git a/.gitignore b/.gitignore index b1d0ec071a..5aaef0d51a 100644 --- a/.gitignore +++ b/.gitignore @@ -59,6 +59,7 @@ cachegrind.out.* /libparrot.def /libparrot.dll /libparrot.dll.a +/cygparrot*.dll /miniparrot /myconfig /ops2c diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in index 5881b36ea3..fb9b3f8ef6 100644 --- a/config/gen/makefiles/root.in +++ b/config/gen/makefiles/root.in @@ -548,7 +548,7 @@ INSTALLABLEWINXED = .@slash@installable_winxed$(EXE) # Libraries LIBPARROT_STATIC = @blib_dir@/@libparrot_static@ #IF(darwin):export DYLD_LIBRARY_PATH := @build_dir@/@blib_dir@:$(DYLD_LIBRARY_PATH) -#IF(win32 or msys):LIBPARROT_SHARED = @libparrot_shared@ +#IF(win32 or msys or cygwin):LIBPARROT_SHARED = @libparrot_shared@ #ELSE:LIBPARROT_SHARED = @blib_dir@/@libparrot_shared@ # This line controls whether a static or shared library is built diff --git a/config/init/hints/cygwin.pm b/config/init/hints/cygwin.pm index b567c21708..d34cce4b02 100644 --- a/config/init/hints/cygwin.pm +++ b/config/init/hints/cygwin.pm @@ -49,7 +49,6 @@ sub runstep { sym_export => '__declspec(dllexport)', sym_import => '__declspec(dllimport)', libparrot_shared => $libparrot_shared, - blib_dir => '.', libparrot_ldflags => '-L' . $build_dir . ' -lparrot', inst_libparrot_ldflags => '-L' . $bindir . ' -lparrot', libparrot_linkflags => '-L' . $build_dir . ' -lparrot',