Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
netrunner
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Odilitime
netrunner
Commits
4e674330
Commit
4e674330
authored
7 years ago
by
despair
Browse files
Options
Downloads
Patches
Plain Diff
added build info to banner
parent
572a38a9
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+3
-2
3 additions, 2 deletions
Makefile
src/main.cpp
+8
-1
8 additions, 1 deletion
src/main.cpp
with
11 additions
and
3 deletions
Makefile
+
3
−
2
View file @
4e674330
...
...
@@ -3,8 +3,9 @@ CXX = g++
CC
=
gcc
GIT_VERSION
:=
$(
shell git describe
--abbrev
=
4
--dirty
--always
--tags
)
PLATFORM
:=
$(
shell g++
-dumpmachine
)
CXXFLAGS
=
-O3
-flto
=
8
-std
=
c++14
-DVERSION
=
\"
$(
GIT_VERSION
)
\"
CXXFLAGS
=
-O3
-flto
=
8
-std
=
c++14
-DVERSION
=
\"
$(
GIT_VERSION
)
\"
-DPLATFORM
=
\"
$(
PLATFORM
)
\"
CFLAGS
=
-O3
-flto
=
8
-std
=
c11
-DVERSION
=
\"
$(
GIT_VERSION
)
\"
CWARN
=
-pedantic
-Wall
-Wextra
-Wcast-align
-Wcast-qual
-Wdisabled-optimization
-Wformat
=
2
-Winit-self
-Wlogical-op
-Wmissing-declarations
-Wmissing-include-dirs
-Wredundant-decls
-Wshadow
-Wsign-conversion
-Wstrict-overflow
=
5
-Wswitch-default
-Wundef
-Wno-unused
WARNINGS
=
-Werror
-pedantic
-Wall
-Wextra
-Wcast-align
-Wcast-qual
-Wctor-dtor-privacy
-Wdisabled-optimization
-Wformat
=
2
-Winit-self
-Wlogical-op
-Wmissing-declarations
-Wmissing-include-dirs
-Wnoexcept
-Wold-style-cast
-Woverloaded-virtual
-Wredundant-decls
-Wshadow
-Wsign-conversion
-Wsign-promo
-Wstrict-null-sentinel
-Wstrict-overflow
=
5
-Wswitch-default
-Wundef
-Wno-unused
-Wzero-as-null-pointer-constant
-Wuseless-cast
...
...
@@ -13,7 +14,7 @@ LDFLAGS = -O3 -flto=8
INCPATH
=
-I
/usr/include/freetype2
-I
/usr/include/harfbuzz
ifeq
($(UNAME), Darwin)
CXXFLAGS
=
-O3
-std
=
c++1y
-DVERSION
=
\"
$(
GIT_VERSION
)
\"
CXXFLAGS
=
-O3
-std
=
c++1y
-DVERSION
=
\"
$(
GIT_VERSION
)
\"
-DPLATFORM
\"
$(
PLATFORM
)
\"
CFLAGS
=
-O3
-std
=
c11
-DVERSION
=
\"
$(
GIT_VERSION
)
\"
WARNINGS
=
CWARN
=
...
...
This diff is collapsed.
Click to expand it.
src/main.cpp
+
8
−
1
View file @
4e674330
...
...
@@ -9,6 +9,13 @@
#include
<iostream>
#include
<sys/stat.h>
#if defined(_WIN32) && !defined(_WIN64)
#define PLATFORM "i686-pc-winnt"
#endif
#ifdef _WIN64
#define PLATFORM "amd64-pc-winnt"
#endif
const
std
::
unique_ptr
<
Window
>
window
=
std
::
make_unique
<
Window
>
();
//URL currentURL;
...
...
@@ -53,7 +60,7 @@ int main(int argc, char *argv[]) {
return 1;
}
*/
std
::
cout
<<
"/g/ntr - NetRunner build "
<<
__DATE__
<<
std
::
endl
;
std
::
cout
<<
"/g/ntr - NetRunner build "
<<
__DATE__
<<
": rev-"
<<
VERSION
<<
" for "
<<
PLATFORM
<<
std
::
endl
;
// we need to set up OGL before we can setDOM (because component can't be constructed (currently) without OGL)
// but should be after CommandLineParams incase we need to change some type of window config
...
...
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