rakelib/compile.rake
changeset 97 33cf3197acb5
parent 94 61b2540acc91
child 101 32f9287b419a
--- a/rakelib/compile.rake	Tue Dec 06 21:31:11 2016 +0000
+++ b/rakelib/compile.rake	Wed Dec 07 11:26:26 2016 +0000
@@ -425,20 +425,16 @@
 end
 
 
-if unix?
-    #task :'stx:libview2:pre' => STX_TOP_DIR / 'support' / 'libjpeg-7' / 'libjpeg.a'
+#
+# Various compilation hacks here and there (sigh)
+# 
 
-    #file STX_TOP_DIR / 'support' / 'libjpeg-7/libjpeg.a' => STX_TOP_DIR / 'support' / 'libjpeg-7' / '.libs' / 'libjpeg.a' do
-    #    cp STX_TOP_DIR / 'support' / 'libjpeg-7' / '.libs' / 'libjpeg.a',
-    #        STX_TOP_DIR / 'support' / 'libjpeg-7' / 'libjpeg.a'
-    #end
-    #
-    #file STX_TOP_DIR / 'support' / 'libjpeg-7' / '.libs' / 'libjpeg.a' do
-    #    chdir STX_TOP_DIR / 'libview2' do
-    #        make '../support/libjpeg-7/.libs/libjpeg.a'
-    #    end
-    #end
-
+if unix?
+  # A hack for Debian (and possibly other Linux distros) that does not ship
+  # 32bit libodbc.a / libodbcinst.a. Link directly against .so
+  task :'stx:libdb/libodbc:pre' do     
+	  sed('-lodbc -lodbcinst' , '-l:libodbc.so.2 -l:libodbcinst.so.2', BUILD_DIR / 'stx' / 'libdb' / 'libodbc' / 'Make.proto', true)
+  end  
 end