Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
f0aac089
Unverified
Commit
f0aac089
authored
Apr 08, 2019
by
Mihai Moldovan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sunweaver-pr/pthread-flags' into arctica-3.6.x
Attributes GH PR #790:
https://github.com/ArcticaProject/nx-libs/pull/790
parents
1ff05c8e
80ecfad9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Makefile.am
nxcomp/src/Makefile.am
+2
-2
No files found.
nxcomp/src/Makefile.am
View file @
f0aac089
...
...
@@ -121,7 +121,6 @@ libXcomp_la_LIBADD = \
@JPEG_LIBS@
\
@PNG_LIBS@
\
@Z_LIBS@
\
@PTHREAD_LIBS@
\
$(NULL)
AM_CXXFLAGS
=
\
...
...
@@ -129,17 +128,18 @@ AM_CXXFLAGS = \
$(JPEG_CFLAGS)
\
$(PNG_CFLAGS)
\
$(Z_CFLAGS)
\
$(PTHREAD_CFLAGS)
\
$(NULL)
AM_CPPFLAGS
=
\
-I
$(top_srcdir)
/include
\
$(PTHREAD_CFLAGS)
\
$(NULL)
libXcomp_la_LDFLAGS
=
\
-version-number
@LT_COMP_VERSION@
\
-no-undefined
\
@PTHREAD_LIBS@
\
$(PTHREAD_CFLAGS)
\
$(NULL)
libXcompincludedir
=
$(includedir)
/nx
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment