Skip to content

Commit fad9ef5

Browse files
committed
Updated license, URLs and garrysmod_common changes.
1 parent a62a684 commit fad9ef5

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

license.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
gm_crypt
22
A cryptography module for the game Garry's Mod.
33
-----------------------------------------------------------------------
4-
Copyright (c) 2015, Daniel Almeida
4+
Copyright (c) 2016, Daniel Almeida
55
All rights reserved.
66

77
Redistribution and use in source and binary forms, with or without

projects/premake5.lua

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
11
newoption({
2-
trigger = "gmcommon",
3-
description = "Sets the path to the garrysmod_common (https://bitbucket.org/danielga/garrysmod_common) directory",
4-
value = "path to garrysmod_common dir"
2+
trigger = "compile-cryptopp",
3+
description = "Compile cryptopp along with the modules"
54
})
65

76
newoption({
8-
trigger = "compile-cryptopp",
9-
description = "Compile cryptopp along with the modules"
7+
trigger = "gmcommon",
8+
description = "Sets the path to the garrysmod_common (https://github.com/danielga/garrysmod_common) directory",
9+
value = "path to garrysmod_common directory"
1010
})
1111

1212
local gmcommon = _OPTIONS.gmcommon or os.getenv("GARRYSMOD_COMMON")
1313
if gmcommon == nil then
14-
error("you didn't provide a path to your garrysmod_common (https://bitbucket.org/danielga/garrysmod_common) directory")
14+
error("you didn't provide a path to your garrysmod_common (https://github.com/danielga/garrysmod_common) directory")
1515
end
1616

1717
include(gmcommon)
1818

19-
local CRYPTOPP_FOLDER = "../cryptopp"
19+
local CRYPTOPP_DIRECTORY = "../cryptopp"
2020

21-
CreateSolution("crypt")
21+
CreateWorkspace({name = "crypt"})
2222
warnings("Off")
2323

24-
CreateProject(SERVERSIDE)
24+
CreateProject({serverside = true})
2525
IncludeLuaShared()
2626
defines("CRYPTOPP_ENABLE_NAMESPACE_WEAK=1")
2727

28-
SetFilter(FILTER_WINDOWS, "options:not compile-cryptopp")
29-
includedirs(CRYPTOPP_FOLDER .. "/include")
30-
libdirs(CRYPTOPP_FOLDER .. "/lib")
28+
filter({"system:windows", "options:not compile-cryptopp"})
29+
includedirs(CRYPTOPP_DIRECTORY .. "/include")
30+
libdirs(CRYPTOPP_DIRECTORY .. "/lib")
3131
links("cryptopp")
3232

33-
SetFilter(FILTER_LINUX, FILTER_MACOSX, "options:not compile-cryptopp")
33+
filter({"system:linux or macosx", "options:not compile-cryptopp"})
3434
linkoptions("-Wl,-Bstatic,-lcryptopp,-Bdynamic")
3535

36-
SetFilter("options:compile-cryptopp")
37-
includedirs(CRYPTOPP_FOLDER .. "/include")
36+
filter("options:compile-cryptopp")
37+
includedirs(CRYPTOPP_DIRECTORY .. "/include")
3838
links("cryptopp")
3939

40-
CreateProject(CLIENTSIDE)
40+
CreateProject({serverside = false})
4141
IncludeLuaShared()
4242
defines("CRYPTOPP_ENABLE_NAMESPACE_WEAK=1")
4343

44-
SetFilter(FILTER_WINDOWS, "options:not compile-cryptopp")
45-
includedirs(CRYPTOPP_FOLDER .. "/include")
46-
libdirs(CRYPTOPP_FOLDER .. "/lib")
44+
filter({"system:windows", "options:not compile-cryptopp"})
45+
includedirs(CRYPTOPP_DIRECTORY .. "/include")
46+
libdirs(CRYPTOPP_DIRECTORY .. "/lib")
4747
links("cryptopp")
4848

49-
SetFilter(FILTER_LINUX, FILTER_MACOSX, "options:not compile-cryptopp")
49+
filter({"system:linux or macosx", "options:not compile-cryptopp"})
5050
linkoptions("-Wl,-Bstatic,-lcryptopp,-Bdynamic")
5151

52-
SetFilter("options:compile-cryptopp")
53-
includedirs(CRYPTOPP_FOLDER .. "/include")
52+
filter("options:compile-cryptopp")
53+
includedirs(CRYPTOPP_DIRECTORY .. "/include")
5454
links("cryptopp")
5555

5656
if _OPTIONS["compile-cryptopp"] then
5757
project("cryptopp")
5858
kind("StaticLib")
5959
defines("USE_PRECOMPILED_HEADERS")
6060
includedirs({
61-
CRYPTOPP_FOLDER .. "/include/cryptopp",
62-
CRYPTOPP_FOLDER .. "/src"
61+
CRYPTOPP_DIRECTORY .. "/include/cryptopp",
62+
CRYPTOPP_DIRECTORY .. "/src"
6363
})
6464
files({
65-
CRYPTOPP_FOLDER .. "/include/cryptopp/*.h",
66-
CRYPTOPP_FOLDER .. "/src/*.cpp"
65+
CRYPTOPP_DIRECTORY .. "/include/cryptopp/*.h",
66+
CRYPTOPP_DIRECTORY .. "/src/*.cpp"
6767
})
6868
vpaths({
69-
["Header files"] = CRYPTOPP_FOLDER .. "/**.h",
70-
["Source files"] = CRYPTOPP_FOLDER .. "/**.cpp"
69+
["Header files"] = CRYPTOPP_DIRECTORY .. "/*.h",
70+
["Source files"] = CRYPTOPP_DIRECTORY .. "/*.cpp"
7171
})
7272
end

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ Another option available for all platforms is compiling cryptopp before linking
1616

1717

1818
[1]: http://www.cryptopp.com
19-
[2]: https://bitbucket.org/danielga/garrysmod_common
19+
[2]: https://github.com/danielga/garrysmod_common

0 commit comments

Comments
 (0)