Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mw
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stuart John Watson
mw
Commits
10e095ae
Commit
10e095ae
authored
10 years ago
by
Justin Mitchell
Browse files
Options
Downloads
Patches
Plain Diff
Turn off strict-prototypes otherwise it breaks on mozjs.h
parent
867b09f6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile.common
+8
-1
8 additions, 1 deletion
Makefile.common
src/client/Makefile
+1
-1
1 addition, 1 deletion
src/client/Makefile
src/client/js.h
+1
-0
1 addition, 0 deletions
src/client/js.h
with
10 additions
and
2 deletions
Makefile.common
+
8
−
1
View file @
10e095ae
...
...
@@ -39,6 +39,13 @@ GCCMINOR := $(echo __GNUC_MINOR__ | $compiler -E -xc - | tail -n 1)
GCCVER
:=
$(
shell
printf
"%02d%02d"
$(
GCCMAJOR
)
$(
GCCMINOR
))
ifeq
($(JSFLAGS),)
JSDIR
=
$(
DEPTH
)
mozjs
JSFLAGS
=
-include
$(
JSDIR
)
/include/js-17.0/js/RequiredDefines.h
-I
/usr/include/nspr
-I
$(
JSDIR
)
/include/js-17.0
LDFLAGS
+=
-L
$(
JSDIR
)
/lib/
JSLIBS
=
-lmozjs-17
.0
JSSCRIPTTYPE
=
JSScript
endif
ifeq
($(JSFLAGS),)
#Fedora
JSFLAGS
=
$(
shell pkg-config
--cflags
libjs 2>/dev/null
)
...
...
@@ -53,7 +60,7 @@ ifeq ($(JSFLAGS),)
endif
# cflags for standard 'cc' compiler
CFLAGS
+=
-Wall
-Wshadow
-Wmissing-prototypes
-Wstrict-prototypes
-Wpointer-arith
-Wwrite-strings
-Wcast-align
-Wbad-function-cast
-Wmissing-format-attribute
-Wformat
=
2
-Wformat-security
-Wformat-nonliteral
-Wno-long-long
-Wno-strict-aliasing
-pedantic
-std
=
gnu99
-D_GNU_SOURCE
$(
JSFLAGS
)
-DJSSCRIPTTYPE
=
$(
JSSCRIPTTYPE
)
CFLAGS
+=
-Wall
-Wshadow
-Wmissing-prototypes
-Wpointer-arith
-Wwrite-strings
-Wcast-align
-Wbad-function-cast
-Wmissing-format-attribute
-Wformat
=
2
-Wformat-security
-Wformat-nonliteral
-Wno-long-long
-Wno-strict-aliasing
-pedantic
-std
=
gnu99
-D_GNU_SOURCE
$(
JSFLAGS
)
-DJSSCRIPTTYPE
=
$(
JSSCRIPTTYPE
)
# until gcc catches up (4.7.x is good)
CFLAGS
+=
$(
shell
if
[
$(
GCCVER
)
-lt
0406
]
;
then
echo
"-Wno-multichar"
;
fi
)
...
...
This diff is collapsed.
Click to expand it.
src/client/Makefile
+
1
−
1
View file @
10e095ae
...
...
@@ -9,7 +9,7 @@ CFLAGS+= -I..
build
:
mw
mw
:
$(CODE:.c=.o) ../libmw.a
$(
CC
)
$(
LDFLAGS
)
$(
LDLIBS
)
-o
$@
$^
$(
CC
)
$(
LDFLAGS
)
-o
$@
$^
$(
LDLIBS
)
install
:
mw
install
-D
mw
$(
DESTDIR
)$(
bindir
)
/mw
...
...
This diff is collapsed.
Click to expand it.
src/client/js.h
+
1
−
0
View file @
10e095ae
...
...
@@ -2,6 +2,7 @@
#define JS_H
#include
<stdio.h>
#include
<jsapi.h>
int
js_isrunning
(
void
);
int
js_exec
(
char
*
name
,
int
argc
,
const
char
**
argvc
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment