ValveSoftware / voglperf

Benchmarking tool for Linux OpenGL games. Spews frame information, logs frametimes.
Other
201 stars 31 forks source link

[minor] Use the available packaged libraries for libedit #22

Open kingtaurus opened 10 years ago

kingtaurus commented 10 years ago

Within Ubuntu (and many other Linux variants) it is possible to use the package libedit-dev to provide necessary headers and libraries for building voglperf.

apt-file list libedit-dev
libedit-dev: /usr/include/editline/history.h
libedit-dev: /usr/include/editline/readline.h
libedit-dev: /usr/include/histedit.h
libedit-dev: /usr/lib/x86_64-linux-gnu/libedit.a
libedit-dev: /usr/lib/x86_64-linux-gnu/libedit.so
libedit-dev: /usr/lib/x86_64-linux-gnu/pkgconfig/libedit.pc
libedit-dev: /usr/share/doc/libedit-dev/changelog.Debian.gz
libedit-dev: /usr/share/doc/libedit-dev/copyright
...snip...

Diffs are below:

diff -p0 src/libedit-3.1/include/histedit.h /usr/include/histedit.h 
*** src/libedit-3.1/include/histedit.h  2014-09-03 10:35:20.000000000 -0700
--- /usr/include/histedit.h 2013-10-21 06:51:16.000000000 -0700
***************
*** 1 ****
! /*    $NetBSD: histedit.h,v 1.50 2013/01/22 20:23:21 christos Exp $   */
--- 1 ----
! /*    $NetBSD: histedit.h,v 1.51 2013/07/12 17:48:29 christos Exp $   */
*************** int      el_wget(EditLine *, int, ...);
*** 281 ****
--- 282 ----
+ int        el_cursor(EditLine *, int);

There is no difference between editline/readline.h;

kingtaurus commented 10 years ago

The only difficulty in using libedit is the fact that there is a dependency conflict between libbsd-dev:amd64 and libbsd-dev:i386. Meaning that building both the 32- and 64-bit applications is not as simple. :-1:

kingtaurus commented 9 years ago

Using Ubuntu 14.10: there is no longer a conflict between libbsd-dev:i386 and libbsd-dev:amd64. I will write up a pull request associated with these changes.

(1) Libraries/packages needed:

libedit-dev
libedit-dev:i386
libncurses5-dev
libncurses5-dev:i386
libtinfo-dev
libtinfo-dev:i386
libgcc-4.9-dev
libgcc-4.9-dev:i386
lib32gcc-4.9-dev
libgcc-4.9-dev
libstdc++-4.9-dev
libstdc++-4.9-dev:i386