Permalink
Browse files

Attempt to enable static linking for Windows

  • Loading branch information...
1 parent 685538c commit 7787f25f3f2c7039ebbe27954f4da8d6c1a1429a @luislavena luislavena committed Sep 26, 2010
Showing with 4 additions and 2 deletions.
  1. +2 −1 ext/mysql2/extconf.rb
  2. +2 −1 tasks/compile.rake
View
@@ -26,7 +26,8 @@ def asplode lib
if RUBY_PLATFORM =~ /mswin|mingw/
inc, lib = dir_config('mysql')
- exit 1 unless have_library("libmysql")
+ library = enable_config('static') ? 'mysqlclient' : 'libmysql'
+ exit 1 unless have_library(library)
elsif mc = (with_config('mysql-config') || Dir[GLOB].first) then
mc = Dir[GLOB].first if mc == true
cflags = `#{mc} --cflags`.chomp
View
@@ -15,7 +15,8 @@ Rake::ExtensionTask.new("mysql2", gemspec) do |ext|
# DRY options feed into compile or cross-compile process
windows_options = [
"--with-mysql-include=#{mysql_lib}/include",
- "--with-mysql-lib=#{mysql_lib}/lib/opt"
+ "--with-mysql-lib=#{mysql_lib}/lib/opt",
+ '--enable-static'
]
# automatically add build options to avoid need of manual input

0 comments on commit 7787f25

Please sign in to comment.