Browse Source

Require latest libticables2 (0.1.3 from 20060723 snapshot), drop compatibility code.

git-svn-id: file:///var/svn/tigccpp/trunk@706 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 18 years ago
parent
commit
400993ca52
3 changed files with 1 additions and 13 deletions
  1. 1 5
      ktigcc/ktigcc.pro
  2. 0 4
      ktigcc/preferences.cpp
  3. 0 4
      ktigcc/preferencesdlg.ui.h

+ 1 - 5
ktigcc/ktigcc.pro

@@ -119,15 +119,11 @@ HAVE_TICONV = $$system(pkg-config --atleast-version=$$TICONV_MINVERSION ticonv &
 PKGCONFIG_CFLAGS += $$system(pkg-config --cflags ticonv)
 LIBS += $$system(pkg-config --libs ticonv)
 
-TICABLES_MINVERSION = 0.0.1
+TICABLES_MINVERSION = 0.1.3
 HAVE_TICABLES = $$system(pkg-config --atleast-version=$$TICABLES_MINVERSION ticables2 && echo yes || echo no)
 !equals(HAVE_TICABLES,yes):error(libticables2 $$TICABLES_MINVERSION or higher required.)
 PKGCONFIG_CFLAGS += $$system(pkg-config --cflags ticables2)
 LIBS += $$system(pkg-config --libs ticables2)
-# Minimum version for ticables_is_usb_enabled
-TICABLES_IS_USB_ENABLED_MINVERSION = 0.1.3
-HAVE_TICABLES_IS_USB_ENABLED = $$system(pkg-config --atleast-version=$$TICABLES_IS_USB_ENABLED_MINVERSION ticables2 && echo yes || echo no)
-equals(HAVE_TICABLES_IS_USB_ENABLED,yes):PKGCONFIG_CFLAGS += -DHAVE_TICABLES_IS_USB_ENABLED
 
 TIFILES_MINVERSION = 0.0.9
 HAVE_TIFILES = $$system(pkg-config --atleast-version=$$TIFILES_MINVERSION tifiles2 && echo yes || echo no)

+ 0 - 4
ktigcc/preferences.cpp

@@ -35,11 +35,7 @@
 #include "preferences.h"
 #include "preferencesdlg.h"
 #include "tpr.h"
-#ifdef HAVE_TICABLES_IS_USB_ENABLED
 #include <ticables.h>
-#else
-#define ticables_is_usb_enabled() (TRUE)
-#endif
 
 TIGCCPrefs preferences;
 

+ 0 - 4
ktigcc/preferencesdlg.ui.h

@@ -37,11 +37,7 @@
 #include <knuminput.h>
 #include <kfontdialog.h>
 #include <kcolordialog.h>
-#ifdef HAVE_TICABLES_IS_USB_ENABLED
 #include <ticables.h>
-#else
-#define ticables_is_usb_enabled() (TRUE)
-#endif
 
 void Preferences::init()
 {