Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
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
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
K'van
Tales of MajEyal
Commits
33e091f9
Commit
33e091f9
authored
11 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
awesome build win
parent
38955d19
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
build/options.lua
+5
-0
5 additions, 0 deletions
build/options.lua
build/te4core.lua
+5
-3
5 additions, 3 deletions
build/te4core.lua
premake4.lua
+1
-1
1 addition, 1 deletion
premake4.lua
with
11 additions
and
4 deletions
build/options.lua
+
5
−
0
View file @
33e091f9
...
...
@@ -61,6 +61,11 @@ newoption {
description
=
"Steam integration"
}
newoption
{
trigger
=
"disable-awesomium"
,
description
=
"Disable using awesomium embedded browser"
}
newoption
{
trigger
=
"wincross"
,
description
=
"Enables cross-compilation for windows (from linux)"
...
...
This diff is collapsed.
Click to expand it.
build/te4core.lua
+
5
−
3
View file @
33e091f9
...
...
@@ -138,7 +138,7 @@ project "TEngine"
----------------------------------------------------------------
----------------------------------------------------------------
project
"physfs"
kind
"S
hared
Lib"
kind
"S
tatic
Lib"
language
"C"
targetname
"physfs"
...
...
@@ -339,7 +339,7 @@ elseif _OPTIONS.lua == "jit2" then
postbuildcommands
{
"cp ../bin/Release/buildvm ../src/luajit2/src/"
,
}
project
"luajit2"
kind
"S
hared
Lib"
kind
"S
tatic
Lib"
language
"C"
targetname
"lua"
links
{
"buildvm"
}
...
...
@@ -512,6 +512,7 @@ project "te4-bzip"
files
{
"../src/bzip2/*.c"
,
}
if
not
_OPTIONS
[
'disable-awesomium'
]
and
not
_OPTIONS
.
wincross
then
project
"te4-web"
kind
"SharedLib"
language
"C++"
...
...
@@ -519,9 +520,10 @@ project "te4-web"
libdirs
{
"/Test/awesomium_v1.7.2_sdk_linux64/bin/"
}
includedirs
{
"/Test/awesomium_v1.7.2_sdk_linux64/include/"
}
links
{
"awesomium-1-7"
,
"lua"
..
_OPTIONS
.
lua
}
links
{
"awesomium-1-7"
}
files
{
"../src/web/*.cpp"
,
}
end
if
_OPTIONS
.
steam
then
dofile
(
"../steamworks/build/steam-code.lua"
)
...
...
This diff is collapsed.
Click to expand it.
premake4.lua
+
1
−
1
View file @
33e091f9
...
...
@@ -75,7 +75,7 @@ configuration "Debug"
defines
{
}
flags
{
"Symbols"
}
buildoptions
{
"-ggdb"
}
buildoptions
{
"-O3"
}
--
buildoptions { "-O3" }
targetdir
"bin/Debug"
if
_OPTIONS
.
luaassert
then
defines
{
"LUA_USE_APICHECK"
}
end
if
_OPTIONS
.
pedantic
then
buildoptions
{
"-Wall"
}
end
...
...
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