Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
9adb2b8
Deleted useless files from Root directory
jushar Feb 24, 2016
4613d5e
Added premake solution file and renamed MTA10 to Client and MTA10_Ser…
jushar Feb 24, 2016
1690825
Added premake and premake files for Server/core
jushar Feb 24, 2016
678219b
Added premake file for dbconmy
jushar Feb 24, 2016
76e9778
Added premake file for launcher (server)
jushar Feb 24, 2016
6d8cd53
Removed unused vectormathlibrary, libv2, texturerenderer, bzip2, bass…
sbx320 Feb 24, 2016
acdcbb8
Added premake files for some vendor projects
jushar Feb 24, 2016
11bb5f5
premake for some Client projects
sbx320 Feb 25, 2016
173387a
More premake stuff
sbx320 Jun 29, 2016
63c987c
Lua, pthread, more Server/deathmatch
sbx320 Jun 29, 2016
dad7d7b
Further work, Server Deathmatch now builds correctly
sbx320 Jun 30, 2016
ba6d5df
premake update, client now compiles apart from CEF, client deathmatch…
sbx320 Jun 30, 2016
68d2636
Fixed Entrypoints
sbx320 Jun 30, 2016
c7608ce
Update
sbx320 Jul 5, 2016
059f821
Update
sbx320 Jul 5, 2016
1a750ca
Fix copy, Fix x86 dir being ignored
sbx320 Jul 5, 2016
8fbd193
Update
sbx320 Jul 5, 2016
15e284a
Add DirectX to include- and libpath
jushar Jul 5, 2016
9f7e278
Fix zlib filter paths and exclude example.c
jushar Jul 5, 2016
0e08b68
Fixed x64
sbx320 Jul 5, 2016
9a87fcf
We dont need dxsdk on linux
sbx320 Jul 5, 2016
2493b43
Update
sbx320 Jul 5, 2016
9a52a0c
Update
sbx320 Jul 5, 2016
9bcbe47
Update
sbx320 Jul 5, 2016
b8a52a0
Update
sbx320 Jul 5, 2016
fe3d3e6
Update
sbx320 Jul 5, 2016
5bd9823
Linux
sbx320 Jul 5, 2016
2c3e0b2
Linux
sbx320 Jul 5, 2016
f367286
Linux
sbx320 Jul 5, 2016
76498d1
Update
sbx320 Jul 5, 2016
0be564b
Update
sbx320 Jul 5, 2016
b793d5d
Update
sbx320 Jul 5, 2016
edab6c8
Update
sbx320 Jul 5, 2016
2ec7649
Update
sbx320 Jul 5, 2016
6056dec
Add premake5 for Linux and fix link error
jushar Jul 5, 2016
6d13781
Update
sbx320 Jul 5, 2016
841dc0b
Merge branch 'premake' of github.com:sbx320/mtasa-blue into premake
sbx320 Jul 5, 2016
e9522f4
Fix typo in previous commit
jushar Jul 5, 2016
765759d
Update
sbx320 Jul 5, 2016
f3ca454
Update
sbx320 Jul 5, 2016
2940489
Update
sbx320 Jul 5, 2016
a29e384
Fix json-c compile error
jushar Jul 5, 2016
50c427c
Fix 'em all
jushar Jul 5, 2016
e10096b
Bla
jushar Jul 5, 2016
36d81e2
Bla #2
jushar Jul 5, 2016
296a110
Update
sbx320 Jul 5, 2016
2df21b7
Fix zip
jushar Jul 5, 2016
baba4fb
Update
sbx320 Jul 5, 2016
e2a8ad2
Fix
jushar Jul 5, 2016
566557a
Update
sbx320 Jul 5, 2016
33df65b
Fix something
jushar Jul 5, 2016
b783e4e
Fuck MTA
jushar Jul 5, 2016
4820e93
Blub
jushar Jul 5, 2016
b45644e
Linker fix
jushar Jul 5, 2016
4f3cb4a
Test
sbx320 Jul 9, 2016
ae637b2
Test
sbx320 Jul 9, 2016
33c9b5a
Test
sbx320 Jul 9, 2016
a902f25
Test
sbx320 Jul 9, 2016
a4d7658
Test
sbx320 Jul 9, 2016
188add3
Merge remote-tracking branch 'upstream/master' into premake
jushar Jul 29, 2016
e0882ec
Move new MTA10 files to Client
jushar Jul 29, 2016
c8cc648
Use filter instead of 'if'
jushar Jul 29, 2016
fcd3eaa
Fix sparsehash include order problem
jushar Jul 29, 2016
4895d68
Fix merge problems
jushar Jul 29, 2016
8f97712
Fix ehs includes and pcre config
jushar Jul 29, 2016
1c6089b
Fix crypo++ build on 32-bit platform
jushar Jul 29, 2016
4488d7e
Add resource files to build process
jushar Jul 29, 2016
e429d7f
Fix client solutions being available on Linux
jushar Jul 29, 2016
0463054
Revert misleading fix
jushar Jul 29, 2016
4b347b5
Fix typos in target names
jushar Jul 29, 2016
8aa4a86
Fix release build and client/dm filters
jushar Jul 29, 2016
b937078
Set +x flag and update gitignore
jushar Jul 29, 2016
a337892
Fix a couple of DLL name issues and split Lua dll into Lua_Client and…
jushar Jul 29, 2016
f63b158
Linux fixes
jushar Jul 29, 2016
6c050fd
Add breakpad premake5.lua
jushar Jul 29, 2016
0dbb0d9
Add generated breakpad configs
jushar Jul 29, 2016
7afe9d2
Fix undefined pthread_once error
jushar Jul 30, 2016
682f571
Use static library versions of lua and pcre on Linux
jushar Jul 30, 2016
6c51e72
Add build instructions to README.md
jushar Jul 30, 2016
a3e12b0
Fix #1 ('Host Game' doesn't work) and fix minor naming issues
jushar Jul 31, 2016
81dff35
Set symbols path to Build/Symbols/ for nightly configuration and fix …
jushar Jul 31, 2016
aed96ff
Merge remote-tracking branch 'upstream/master' into premake
jushar Jul 31, 2016
389289d
Move files from MTA10 to Client
jushar Jul 31, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 4 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
##################
## Our own ignores
##################
output/


#########################################################################
## General system gitignore contents:
## Source: github.com/github/gitignore/blob/master/Global/Linux.gitignore
Expand Down Expand Up @@ -96,8 +90,6 @@ Temporary Items
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
build/
bld/
[Bb]in/
Expand Down Expand Up @@ -310,4 +302,7 @@ _Pvt_Extensions
.paket/paket.exe

# FAKE - F# Make
.fake/
.fake/

Bin/
Build/
File renamed without changes.
File renamed without changes.
28 changes: 28 additions & 0 deletions Client/ceflauncher/premake5.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
project "CEFLauncher"
language "C++"
kind "WindowedApp"
targetname "CEFLauncher"
targetdir(buildpath("mta/cef"))

includedirs { "../sdk" }

links { "CEFLauncher DLL"}
flags { "WinMain" }

vpaths {
["Headers/*"] = "**.h",
["Sources/*"] = "**.cpp",
["*"] = "premake5.lua"
}


files {
"premake5.lua",
"*.h",
"*.cpp"
}

filter "architecture:x64"
flags { "ExcludeFromBuild" }
filter "system:not windows"
flags { "ExcludeFromBuild" }
File renamed without changes.
File renamed without changes.
File renamed without changes.
38 changes: 38 additions & 0 deletions Client/ceflauncher_DLL/premake5.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
project "CEFLauncher DLL"
language "C++"
kind "SharedLib"
targetname "CEFLauncher_DLL"
targetdir(buildpath("mta/cef"))

includedirs {
"../../vendor/cef3"
}

defines { "UNICODE" }

vpaths {
["Headers/*"] = "**.h",
["Sources/*"] = "**.cpp",
["*"] = "premake5.lua"
}


files {
"premake5.lua",
"*.h",
"*.cpp"
}

links { "CEF" }

filter "configurations:Debug"
links { "../../vendor/cef3/Debug/libcef.lib" }

filter "configurations:Release or configurations:Nightly"
links { "../../vendor/cef3/Release/libcef.lib" }

filter "architecture:x64"
flags { "ExcludeFromBuild" }

filter "system:not windows"
flags { "ExcludeFromBuild" }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion MTA10/core/CGraphics.h → Client/core/CGraphics.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class CGraphics;
#include <gui/CGUI.h>
#include "CGUI.h"
#include "CSingleton.h"
#include <CRenderItemManager.h>
#include "CRenderItemManager.h"

#define DUMMY_PROGRESS_INITIAL_DELAY 1000 // Game stall time before spinner is displayed
#define DUMMY_PROGRESS_MIN_DISPLAY_TIME 1000 // Minimum time spinner is drawn (to prevent flicker)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
64 changes: 64 additions & 0 deletions Client/core/premake5.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
project "Client Core"
language "C++"
kind "SharedLib"
targetname "core"
targetdir(buildpath("mta"))

filter "system:windows"
includedirs { "../../vendor/sparsehash/current/src/windows" }
linkoptions { "/SAFESEH\:NO" }

filter {}
includedirs {
"../sdk",
"../../vendor/cef3",
"../../vendor/tinygettext",
"../../vendor/zlib",
"../../vendor/jpeg-8d",
"../../vendor/pthreads/include",
"../../vendor/sparsehash/current/src/"
}

libdirs {
"../../vendor/detours/lib"
}


pchheader "StdInc.h"
pchsource "StdInc.cpp"

vpaths {
["Headers/*"] = "**.h",
["Sources/*"] = "**.cpp",
["*"] = "premake5.lua"
}

files {
"premake5.lua",
"*.h",
"*.cpp"
}

links {
"ws2_32", "d3dx9", "Userenv", "DbgHelp", "xinput", "Imagehlp", "dxguid", "dinput8",
"strmiids", "odbc32", "odbccp32", "shlwapi", "winmm", "gdi32", "Imm32", "Psapi",
"pthread", "libpng", "jpeg", "zlib", "tinygettext", "libcef", "CEF", "detours"
}

defines {
"INITGUID",
"_WIN32_WINNT=0x502",
"PNG_SETJMP_NOT_SUPPORTED"
}

filter "architecture:x64"
flags { "ExcludeFromBuild" }

filter "configurations:Debug"
libdirs { "../../vendor/cef3/Debug" }

filter "configurations:Release or configurations:Nightly"
libdirs { "../../vendor/cef3/Release" }

filter "system:not windows"
flags { "ExcludeFromBuild" }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading