Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv20190/ext/fox
Modified Files:
extconf.rb extconf.rb.tmpl
Log Message:
Index: extconf.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/extconf.rb,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** extconf.rb 13 Mar 2002 18:18:20 -0000 1.26
--- extconf.rb 21 Mar 2002 23:00:40 -0000 1.27
***************
*** 1,4 ****
--- 1,5 ----
#!/bin/env ruby
+ require 'ftools'
require 'mkmf'
***************
*** 39,43 ****
end
! def isScintillaBuild
args = ARGV.delete_if { |e| !(e =~ /--with-scintilla/) }
args.length > 0
--- 40,44 ----
end
! def is_scintilla_build?
args = ARGV.delete_if { |e| !(e =~ /--with-scintilla/) }
args.length > 0
***************
*** 80,86 ****
$libs = append_library($libs, "FOX")
$CFLAGS = $CFLAGS + " -fno-strict-prototype -fpermissive -DWIN32 -Iinclude"
! if isScintillaBuild
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla")
end
elsif RUBY_PLATFORM =~ /mswin32/
--- 81,90 ----
$libs = append_library($libs, "FOX")
$CFLAGS = $CFLAGS + " -fno-strict-prototype -fpermissive -DWIN32 -Iinclude"
! if is_scintilla_build?
! File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla")
+ else
+ File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
end
elsif RUBY_PLATFORM =~ /mswin32/
***************
*** 106,112 ****
$CFLAGS = $CFLAGS + "/DWIN32 /GR /GX /Iinclude"
$LOCAL_LIBS = $LOCAL_LIBS + "foxst.lib"
! if isScintillaBuild
$CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla-static")
end
else
--- 110,119 ----
$CFLAGS = $CFLAGS + "/DWIN32 /GR /GX /Iinclude"
$LOCAL_LIBS = $LOCAL_LIBS + "foxst.lib"
! if is_scintilla_build?
! File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla-static")
+ else
+ File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
end
else
***************
*** 124,130 ****
$libs = append_library($libs, "FOX")
$CFLAGS = $CFLAGS + "-O0 -Iinclude"
! if isScintillaBuild
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla")
end
end
--- 131,140 ----
$libs = append_library($libs, "FOX")
$CFLAGS = $CFLAGS + "-O0 -Iinclude"
! if is_scintilla_build?
! File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla")
+ else
+ File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
end
end
Index: extconf.rb.tmpl
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/extconf.rb.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** extconf.rb.tmpl 13 Mar 2002 18:18:20 -0000 1.16
--- extconf.rb.tmpl 21 Mar 2002 23:00:40 -0000 1.17
***************
*** 1,4 ****
--- 1,5 ----
#!/bin/env ruby
+ require 'ftools'
require 'mkmf'
***************
*** 39,43 ****
end
! def isScintillaBuild
args = ARGV.delete_if { |e| !(e =~ /--with-scintilla/) }
args.length > 0
--- 40,44 ----
end
! def is_scintilla_build?
args = ARGV.delete_if { |e| !(e =~ /--with-scintilla/) }
args.length > 0
***************
*** 80,86 ****
$libs = append_library($libs, "FOX")
$CFLAGS = $CFLAGS + " -fno-strict-prototype -fpermissive -DWIN32 -Iinclude"
! if isScintillaBuild
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla")
end
elsif RUBY_PLATFORM =~ /mswin32/
--- 81,90 ----
$libs = append_library($libs, "FOX")
$CFLAGS = $CFLAGS + " -fno-strict-prototype -fpermissive -DWIN32 -Iinclude"
! if is_scintilla_build?
! File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla")
+ else
+ File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
end
elsif RUBY_PLATFORM =~ /mswin32/
***************
*** 106,112 ****
$CFLAGS = $CFLAGS + "/DWIN32 /GR /GX /Iinclude"
$LOCAL_LIBS = $LOCAL_LIBS + "foxst.lib"
! if isScintillaBuild
$CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla-static")
end
else
--- 110,119 ----
$CFLAGS = $CFLAGS + "/DWIN32 /GR /GX /Iinclude"
$LOCAL_LIBS = $LOCAL_LIBS + "foxst.lib"
! if is_scintilla_build?
! File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla-static")
+ else
+ File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
end
else
***************
*** 124,130 ****
$libs = append_library($libs, "FOX")
$CFLAGS = $CFLAGS + "-O0 -Iinclude"
! if isScintillaBuild
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla")
end
end
--- 131,140 ----
$libs = append_library($libs, "FOX")
$CFLAGS = $CFLAGS + "-O0 -Iinclude"
! if is_scintilla_build?
! File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
$libs = append_library($libs, "scintilla")
+ else
+ File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
end
end
|
