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

Changed the relative path to the extension's "include" directory

to an absolute path, so that the rake-compiler task can see those
files.
parent 3b61f37d
No related branches found
No related tags found
No related merge requests found
...@@ -85,7 +85,7 @@ def do_cygwin_setup ...@@ -85,7 +85,7 @@ def do_cygwin_setup
have_library("jpeg", "jpeg_mem_init") have_library("jpeg", "jpeg_mem_init")
have_library("tiff", "TIFFSetErrorHandler") have_library("tiff", "TIFFSetErrorHandler")
$libs = append_library($libs, "FOX-1.6") $libs = append_library($libs, "FOX-1.6")
$CFLAGS = $CFLAGS + " -fpermissive -DWIN32 -Iinclude" $CFLAGS = $CFLAGS + " -fpermissive -DWIN32 -I#{File.join(File.dirname(__FILE__), 'include')}"
if is_fxscintilla_build? if is_fxscintilla_build?
FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak') FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6" $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6"
...@@ -108,7 +108,7 @@ def do_mswin32_setup ...@@ -108,7 +108,7 @@ def do_mswin32_setup
have_library("libtiff", "TIFFSetErrorHandler") have_library("libtiff", "TIFFSetErrorHandler")
# $CFLAGS = $CFLAGS + " /DWIN32 /GR /GX /DFOXDLL /Iinclude" # $CFLAGS = $CFLAGS + " /DWIN32 /GR /GX /DFOXDLL /Iinclude"
# $LOCAL_LIBS = $LOCAL_LIBS + "foxdll.lib" # $LOCAL_LIBS = $LOCAL_LIBS + "foxdll.lib"
$CFLAGS = $CFLAGS + " /DWIN32 /DUNICODE /GR /GX /Iinclude" $CFLAGS = $CFLAGS + " /DWIN32 /DUNICODE /GR /GX /I#{File.join(File.dirname(__FILE__), 'include')}"
$LOCAL_LIBS = $LOCAL_LIBS + "FOX-1.6.lib" $LOCAL_LIBS = $LOCAL_LIBS + "FOX-1.6.lib"
if is_fxscintilla_build? if is_fxscintilla_build?
FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak') FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
...@@ -134,7 +134,7 @@ def do_unix_setup ...@@ -134,7 +134,7 @@ def do_unix_setup
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")
$CFLAGS = $CFLAGS + " -O0 -Iinclude" $CFLAGS = $CFLAGS + " -O0 -I#{File.join(File.dirname(__FILE__), 'include')}"
if is_fxscintilla_build? if is_fxscintilla_build?
FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak') FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6" $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6"
...@@ -160,7 +160,7 @@ def do_darwin_setup ...@@ -160,7 +160,7 @@ def do_darwin_setup
$libs = append_library($libs, "Xrandr") $libs = append_library($libs, "Xrandr")
$libs = append_library($libs, "Xcursor") $libs = append_library($libs, "Xcursor")
$libs = append_library($libs, "png") $libs = append_library($libs, "png")
$CFLAGS = $CFLAGS + " -O0 -Iinclude" $CFLAGS = $CFLAGS + " -O0 -I#{File.join(File.dirname(__FILE__), 'include')}"
if is_fxscintilla_build? if is_fxscintilla_build?
FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak') FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6" $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment