Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
illuna-minetest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Illuna-Minetest
illuna-minetest
Commits
558d715b
Commit
558d715b
authored
9 years ago
by
sfan5
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Only lowercase project name at compile time"
This reverts commit
3be9787e
.
parent
415167b2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/cmake_config.h.in
+0
-1
0 additions, 1 deletion
src/cmake_config.h.in
src/config.h
+0
-1
0 additions, 1 deletion
src/config.h
src/gettext.cpp
+3
-2
3 additions, 2 deletions
src/gettext.cpp
src/porting.cpp
+8
-7
8 additions, 7 deletions
src/porting.cpp
with
11 additions
and
11 deletions
src/cmake_config.h.in
+
0
−
1
View file @
558d715b
...
...
@@ -4,7 +4,6 @@
#define CMAKE_CONFIG_H
#define PROJECT_NAME "@PROJECT_NAME@"
#define PROJECT_NAME_LOWER "@PROJECT_NAME_LOWER@"
#define VERSION_MAJOR @VERSION_MAJOR@
#define VERSION_MINOR @VERSION_MINOR@
#define VERSION_PATCH @VERSION_PATCH@
...
...
This diff is collapsed.
Click to expand it.
src/config.h
+
0
−
1
View file @
558d715b
...
...
@@ -14,7 +14,6 @@
#include
"cmake_config.h"
#elif defined (__ANDROID__) || defined (ANDROID)
#define PROJECT_NAME "Minetest"
#define PROJECT_NAME_LOWER "minetest"
#define STATIC_SHAREDIR ""
#include
"android_version.h"
#ifdef NDEBUG
...
...
This diff is collapsed.
Click to expand it.
src/gettext.cpp
+
3
−
2
View file @
558d715b
...
...
@@ -236,8 +236,9 @@ void init_gettext(const char *path, const std::string &configured_language) {
#endif
#endif
bindtextdomain
(
PROJECT_NAME_LOWER
,
path
);
textdomain
(
PROJECT_NAME_LOWER
);
static
std
::
string
name
=
lowercase
(
PROJECT_NAME
);
bindtextdomain
(
name
.
c_str
(),
path
);
textdomain
(
name
.
c_str
());
#if defined(_WIN32)
// Set character encoding for Win32
...
...
This diff is collapsed.
Click to expand it.
src/porting.cpp
+
8
−
7
View file @
558d715b
...
...
@@ -475,11 +475,11 @@ bool setSystemPaths()
// Use ".\bin\.."
path_share
=
std
::
string
(
buf
)
+
"
\\
.."
;
// Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME
_LOWER
>"
// Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
DWORD
len
=
GetEnvironmentVariable
(
"APPDATA"
,
buf
,
sizeof
(
buf
));
FATAL_ERROR_IF
(
len
==
0
||
len
>
sizeof
(
buf
),
"Failed to get APPDATA"
);
path_user
=
std
::
string
(
buf
)
+
DIR_DELIM
PROJECT_NAME
_LOWER
;
path_user
=
std
::
string
(
buf
)
+
DIR_DELIM
+
lowercase
(
PROJECT_NAME
)
;
return
true
;
}
...
...
@@ -511,7 +511,7 @@ bool setSystemPaths()
trylist
.
push_back
(
static_sharedir
);
trylist
.
push_back
(
bindir
+
DIR_DELIM
".."
DIR_DELIM
"share"
DIR_DELIM
PROJECT_NAME
_LOWER
);
DIR_DELIM
+
lowercase
(
PROJECT_NAME
)
);
trylist
.
push_back
(
bindir
+
DIR_DELIM
".."
);
#ifdef __ANDROID__
...
...
@@ -540,7 +540,7 @@ bool setSystemPaths()
#ifndef __ANDROID__
path_user
=
std
::
string
(
getenv
(
"HOME"
))
+
DIR_DELIM
"."
PROJECT_NAME
_LOWER
;
+
lowercase
(
PROJECT_NAME
)
;
#endif
return
true
;
...
...
@@ -563,8 +563,9 @@ bool setSystemPaths()
}
CFRelease
(
resources_url
);
path_user
=
std
::
string
(
getenv
(
"HOME"
))
+
"/Library/Application Support/"
PROJECT_NAME_LOWER
;
path_user
=
std
::
string
(
getenv
(
"HOME"
))
+
"/Library/Application Support/"
+
lowercase
(
PROJECT_NAME
);
return
true
;
}
...
...
@@ -575,7 +576,7 @@ bool setSystemPaths()
{
path_share
=
STATIC_SHAREDIR
;
path_user
=
std
::
string
(
getenv
(
"HOME"
))
+
DIR_DELIM
"."
PROJECT_NAME
_LOWER
;
+
lowercase
(
PROJECT_NAME
)
;
return
true
;
}
...
...
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