Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
tome
Tales of MajEyal
Commits
0136c5ef
Commit
0136c5ef
authored
9 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
new --no-web command
Fixed the game not starting on some latest ubuntu installs
parent
78af673b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main.c
+3
-1
3 additions, 1 deletion
src/main.c
src/web.c
+12
-0
12 additions, 0 deletions
src/web.c
with
15 additions
and
1 deletion
src/main.c
+
3
−
1
View file @
0136c5ef
...
@@ -1343,6 +1343,7 @@ int main(int argc, char *argv[])
...
@@ -1343,6 +1343,7 @@ int main(int argc, char *argv[])
bool
logtofile
=
FALSE
;
bool
logtofile
=
FALSE
;
bool
is_zygote
=
FALSE
;
bool
is_zygote
=
FALSE
;
bool
os_autoflush
=
FALSE
;
bool
os_autoflush
=
FALSE
;
bool
no_web
=
FALSE
;
FILE
*
logfile
=
NULL
;
FILE
*
logfile
=
NULL
;
// Parse arguments
// Parse arguments
...
@@ -1371,6 +1372,7 @@ int main(int argc, char *argv[])
...
@@ -1371,6 +1372,7 @@ int main(int argc, char *argv[])
if
(
!
strncmp
(
arg
,
"--type=renderer"
,
15
))
is_zygote
=
TRUE
;
if
(
!
strncmp
(
arg
,
"--type=renderer"
,
15
))
is_zygote
=
TRUE
;
if
(
!
strncmp
(
arg
,
"--no-sandbox"
,
12
))
is_zygote
=
TRUE
;
if
(
!
strncmp
(
arg
,
"--no-sandbox"
,
12
))
is_zygote
=
TRUE
;
if
(
!
strncmp
(
arg
,
"--logtofile"
,
11
))
logtofile
=
TRUE
;
if
(
!
strncmp
(
arg
,
"--logtofile"
,
11
))
logtofile
=
TRUE
;
if
(
!
strncmp
(
arg
,
"--no-web"
,
8
))
no_web
=
TRUE
;
}
}
#ifdef SELFEXE_WINDOWS
#ifdef SELFEXE_WINDOWS
...
@@ -1392,7 +1394,7 @@ int main(int argc, char *argv[])
...
@@ -1392,7 +1394,7 @@ int main(int argc, char *argv[])
}
}
#endif
#endif
te4_web_load
();
if
(
!
no_web
)
te4_web_load
();
// Initialize display lock for thread safety.
// Initialize display lock for thread safety.
renderingLock
=
SDL_CreateMutex
();
renderingLock
=
SDL_CreateMutex
();
...
...
This diff is collapsed.
Click to expand it.
src/web.c
+
12
−
0
View file @
0136c5ef
...
@@ -577,6 +577,18 @@ void te4_web_load() {
...
@@ -577,6 +577,18 @@ void te4_web_load() {
printf
(
"WebCore config: library(%s) spawn(%s)
\n
"
,
libname
?
libname
:
"--"
,
spawnname
?
spawnname
:
"--"
);
printf
(
"WebCore config: library(%s) spawn(%s)
\n
"
,
libname
?
libname
:
"--"
,
spawnname
?
spawnname
:
"--"
);
printf
(
"Loading WebCore: %s
\n
"
,
web
?
"loaded!"
:
SDL_GetError
());
printf
(
"Loading WebCore: %s
\n
"
,
web
?
"loaded!"
:
SDL_GetError
());
#if defined(SELFEXE_LINUX) || defined(SELFEXE_BSD)
// Hack to fix a strange bug when it fails to load the library on some linux version it core dumps. So we restart a new process and tell it to not even try
if
(
!
web
)
{
char
**
newargs
=
calloc
(
g_argc
+
2
,
sizeof
(
char
*
));
int
i
;
for
(
i
=
0
;
i
<
g_argc
;
i
++
)
newargs
[
i
]
=
g_argv
[
i
];
newargs
[
g_argc
]
=
strdup
(
"--no-web"
);
newargs
[
g_argc
+
1
]
=
NULL
;
execv
(
get_self_executable
(
g_argc
,
g_argv
),
newargs
);
}
#endif
if
(
web
)
{
if
(
web
)
{
webcore
=
TRUE
;
webcore
=
TRUE
;
te4_web_setup
=
(
void
(
*
)(
te4_web_setup
=
(
void
(
*
)(
...
...
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