Skip to content
Snippets Groups Projects
Commit ee8f3a13 authored by Lyle Johnson's avatar Lyle Johnson
Browse files

More hacking of the do_rake_compiler setup method to get it to work for MinGW build

parent 9de5b002
No related branches found
No related tags found
No related merge requests found
...@@ -171,11 +171,17 @@ def do_darwin_setup ...@@ -171,11 +171,17 @@ def do_darwin_setup
end end
def do_rake_compiler_setup def do_rake_compiler_setup
$CFLAGS = $CFLAGS + " -I/usr/local/include" # Added for MinGW, to find libpng
$LDFLAGS = $LDFLAGS + " -I/usr/local/lib" # Added for MinGW, to find libpng
# Prepend these Windows libs for MinGW build
%w{stdc++ glu32 opengl32 wsock32 comctl32 mpr gdi32 winspool}.each {|lib| $libs = append_library($libs, lib) }
$libs = append_library($libs, "stdc++") $libs = append_library($libs, "stdc++")
# have_header("sys/time.h") # Breaks MinGW build # have_header("sys/time.h") # Breaks MinGW build
have_header("signal.h") have_header("signal.h")
have_library("png", "png_create_read_struct") if have_library("z", "deflate")
have_library("z", "deflate") have_library("png", "png_create_read_struct")
end
have_library("jpeg", "jpeg_mem_init") have_library("jpeg", "jpeg_mem_init")
have_library("tiff", "TIFFSetErrorHandler") have_library("tiff", "TIFFSetErrorHandler")
find_library("Xext", "XShmQueryVersion", "/usr/X11R6/lib") find_library("Xext", "XShmQueryVersion", "/usr/X11R6/lib")
...@@ -183,8 +189,8 @@ def do_rake_compiler_setup ...@@ -183,8 +189,8 @@ def do_rake_compiler_setup
find_library("GL", "glXCreateContext", "/usr/X11R6/lib") find_library("GL", "glXCreateContext", "/usr/X11R6/lib")
find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib") find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib")
$libs = append_library($libs, "FOX-1.6") $libs = append_library($libs, "FOX-1.6")
$libs = append_library($libs, "Xrandr") # $libs = append_library($libs, "Xrandr") # breaks MinGW build
$libs = append_library($libs, "Xcursor") # $libs = append_library($libs, "Xcursor") # breaks MinGW build
$libs = append_library($libs, "png") $libs = append_library($libs, "png")
$CFLAGS = $CFLAGS + " -O0 -I#{File.join(File.dirname(__FILE__), 'include')}" $CFLAGS = $CFLAGS + " -O0 -I#{File.join(File.dirname(__FILE__), 'include')}"
if is_fxscintilla_build? if is_fxscintilla_build?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment