Skip to content

Commit d1526f4

Browse files
committed
This commit brings tbe project closer to a successful GNU/Linux build. Unfortunately, I do not have an environment available to me right now to properly test it and resolve issues that I am sure exist due to the change to display_surface. At this point I want to get the (fully working) VS2017 Windows build out and available. I won't tag any commit R4 until it build with multiple platforms, but for now I'm pushing this to the world.
1 parent 8cdff23 commit d1526f4

11 files changed

+1105
-153
lines changed

N3888_RefImpl/src/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ endif
4141
##then
4242
## N3888_RefImpl_LDADD += -fpermissive
4343
##fi
44+
N3888_RefImpl_LDADD += -lturbojpeg

configure.ac

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ AC_CONFIG_HEADERS([config.h])
77
AC_CONFIG_FILES([Makefile N3888_RefImpl/Makefile N3888_RefImpl/src/Makefile])
88
AC_CONFIG_MACRO_DIR([m4])
99
AC_LANG([C++])
10-
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
11-
AX_CFLAGS_WARN_ALL
12-
AX_CXXFLAGS_WARN_ALL
13-
14-
dnl check for libjpeg-turbo
15-
AC_CHECK_HEADERS(turbojpeg.h,[],[AC_MSG_ERROR(turbojpeg.h not found. Install libjpeg-turbo), AC_INCLUDES_DEFAULT)
16-
AC_SEARCH_LIBS(tjInitCompress,jpeg,[],[AC_MSG_ERROR(libjpeg-turbo not found. Install libjpeg-turbo),[])
17-
PKG_CHECK_MODULES([GTKCAIRO], [gtk+-3.0 >= 3.8.0 gmodule-2.0 gobject-2.0 cairo >= 1.12.16 x11])
10+
dnl AX_CXX_COMPILE_STDCXX_14([noext], [mandatory])
11+
dnl AX_CFLAGS_WARN_ALL
12+
dnl AX_CXXFLAGS_WARN_ALL
13+
dnl AC_CHECK_HEADERS([turbojpeg.h],[],[AC_MSG_ERROR(turbojpeg.h not found. Install libjpeg-turbo)], [AC_INCLUDES_DEFAULT])
14+
dnl AC_SEARCH_LIBS([tjInitCompress],[libturbojpeg],[],[AC_MSG_ERROR(libjpeg-turbo not found. Install libjpeg-turbo)],[-lz -lm])
15+
PKG_CHECK_MODULES([GTKCAIRO], [cairo >= 1.12.16 x11])
1816
PKG_PROG_PKG_CONFIG
1917
AC_ARG_ENABLE([xcb],
2018
[ --enable-xcb Build with Xcb],

m4/ax_append_flag.m4

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_append_flag.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
@@ -34,7 +34,7 @@
3434
# Public License for more details.
3535
#
3636
# You should have received a copy of the GNU General Public License along
37-
# with this program. If not, see <http://www.gnu.org/licenses/>.
37+
# with this program. If not, see <https://www.gnu.org/licenses/>.
3838
#
3939
# As a special exception, the respective Autoconf Macro's copyright owner
4040
# gives unlimited permission to copy, distribute and modify the configure
@@ -49,21 +49,23 @@
4949
# modified version of the Autoconf Macro, you may extend this special
5050
# exception to the GPL to apply to your modified version as well.
5151

52-
#serial 2
52+
#serial 7
5353

5454
AC_DEFUN([AX_APPEND_FLAG],
55-
[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
56-
AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
57-
AS_VAR_SET_IF(FLAGS,
58-
[case " AS_VAR_GET(FLAGS) " in
59-
*" $1 "*)
60-
AC_RUN_LOG([: FLAGS already contains $1])
61-
;;
62-
*)
63-
AC_RUN_LOG([: FLAGS="$FLAGS $1"])
64-
AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"])
65-
;;
66-
esac],
67-
[AS_VAR_SET(FLAGS,["$1"])])
55+
[dnl
56+
AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
57+
AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
58+
AS_VAR_SET_IF(FLAGS,[
59+
AS_CASE([" AS_VAR_GET(FLAGS) "],
60+
[*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
61+
[
62+
AS_VAR_APPEND(FLAGS,[" $1"])
63+
AC_RUN_LOG([: FLAGS="$FLAGS"])
64+
])
65+
],
66+
[
67+
AS_VAR_SET(FLAGS,[$1])
68+
AC_RUN_LOG([: FLAGS="$FLAGS"])
69+
])
6870
AS_VAR_POPDEF([FLAGS])dnl
6971
])dnl AX_APPEND_FLAG

m4/ax_cflags_warn_all.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_cflags_warn_all.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_cflags_warn_all.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
@@ -43,7 +43,7 @@
4343
# Public License for more details.
4444
#
4545
# You should have received a copy of the GNU General Public License along
46-
# with this program. If not, see <http://www.gnu.org/licenses/>.
46+
# with this program. If not, see <https://www.gnu.org/licenses/>.
4747
#
4848
# As a special exception, the respective Autoconf Macro's copyright owner
4949
# gives unlimited permission to copy, distribute and modify the configure
@@ -58,7 +58,7 @@
5858
# modified version of the Autoconf Macro, you may extend this special
5959
# exception to the GPL to apply to your modified version as well.
6060

61-
#serial 15
61+
#serial 16
6262

6363
AC_DEFUN([AX_FLAGS_WARN_ALL],[dnl
6464
AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl

m4/ax_check_define.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_check_define.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_check_define.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
@@ -29,7 +29,7 @@
2929
# Public License for more details.
3030
#
3131
# You should have received a copy of the GNU General Public License along
32-
# with this program. If not, see <http://www.gnu.org/licenses/>.
32+
# with this program. If not, see <https://www.gnu.org/licenses/>.
3333
#
3434
# As a special exception, the respective Autoconf Macro's copyright owner
3535
# gives unlimited permission to copy, distribute and modify the configure
@@ -44,7 +44,7 @@
4444
# modified version of the Autoconf Macro, you may extend this special
4545
# exception to the GPL to apply to your modified version as well.
4646

47-
#serial 8
47+
#serial 9
4848

4949
AU_ALIAS([AC_CHECK_DEFINED], [AC_CHECK_DEFINE])
5050
AC_DEFUN([AC_CHECK_DEFINE],[

0 commit comments

Comments
 (0)