Temporarily
This commit is contained in:
parent
04a640d81d
commit
a21c928364
2
deps/protobuf
vendored
2
deps/protobuf
vendored
@ -1 +1 @@
|
|||||||
Subproject commit e721ce66cfeaa5d8790ecba09c73d1ef399887d2
|
Subproject commit 8c936063570e5ede2ac41cf49aefe1075f1c7251
|
@ -49,6 +49,8 @@ function bitmrc.project()
|
|||||||
path.join(bitmrc.settings.source, "BitMRC/main.*"),
|
path.join(bitmrc.settings.source, "BitMRC/main.*"),
|
||||||
path.join(bitmrc.settings.source, "BitMRC/class.*"),
|
path.join(bitmrc.settings.source, "BitMRC/class.*"),
|
||||||
path.join(bitmrc.settings.source, "BitMRC/tests/**"),
|
path.join(bitmrc.settings.source, "BitMRC/tests/**"),
|
||||||
|
|
||||||
|
path.join(bitmrc.settings.source, "BitMRC/Storage/Storable.cpp"),
|
||||||
}
|
}
|
||||||
|
|
||||||
-- dependencies
|
-- dependencies
|
||||||
|
@ -21,6 +21,11 @@ end
|
|||||||
|
|
||||||
function libcryptopp.includes()
|
function libcryptopp.includes()
|
||||||
if not libcryptopp.settings then error("Run libcryptopp.setup first") end
|
if not libcryptopp.settings then error("Run libcryptopp.setup first") end
|
||||||
|
|
||||||
|
--defines { "CRYPTOPP_IMPORTS" }
|
||||||
|
|
||||||
|
--filter "*Static"
|
||||||
|
-- removedefines { "CRYPTOPP_IMPORTS" }
|
||||||
|
|
||||||
filter "Debug*"
|
filter "Debug*"
|
||||||
defines { "_DEBUG" }
|
defines { "_DEBUG" }
|
||||||
@ -102,6 +107,12 @@ function libcryptopp.project()
|
|||||||
path.join(libcryptopp.settings.source, "fipsalgt.*"),
|
path.join(libcryptopp.settings.source, "fipsalgt.*"),
|
||||||
path.join(libcryptopp.settings.source, "cryptlib_bds.*"),
|
path.join(libcryptopp.settings.source, "cryptlib_bds.*"),
|
||||||
path.join(libcryptopp.settings.source, "validat*.*"),
|
path.join(libcryptopp.settings.source, "validat*.*"),
|
||||||
|
|
||||||
|
-- Remove linker warnings
|
||||||
|
path.join(libcryptopp.settings.source, "strciphr.cpp"),
|
||||||
|
path.join(libcryptopp.settings.source, "simple.cpp"),
|
||||||
|
path.join(libcryptopp.settings.source, "polynomi.cpp"),
|
||||||
|
path.join(libcryptopp.settings.source, "algebra.cpp"),
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Pre-compiled header
|
-- Pre-compiled header
|
||||||
@ -117,13 +128,16 @@ function libcryptopp.project()
|
|||||||
"MASM",
|
"MASM",
|
||||||
--"CustomProtoBuildTool",
|
--"CustomProtoBuildTool",
|
||||||
}
|
}
|
||||||
|
|
||||||
kind "SharedLib"
|
-- SharedLib needs that
|
||||||
filter "*Static"
|
--links { "Ws2_32" }
|
||||||
|
|
||||||
|
--kind "SharedLib"
|
||||||
|
--filter "*Static"
|
||||||
kind "StaticLib"
|
kind "StaticLib"
|
||||||
|
|
||||||
filter "kind:SharedLib"
|
filter "kind:SharedLib"
|
||||||
defines { "CRYPTOPP_IMPORTS" }
|
defines { "CRYPTOPP_EXPORTS" }
|
||||||
|
|
||||||
filter "architecture:x86"
|
filter "architecture:x86"
|
||||||
exceptionhandling "SEH"
|
exceptionhandling "SEH"
|
||||||
|
@ -45,10 +45,10 @@ function sqlite3.project()
|
|||||||
-- not our code, ignore POSIX usage warnings for now
|
-- not our code, ignore POSIX usage warnings for now
|
||||||
warnings "Off"
|
warnings "Off"
|
||||||
|
|
||||||
kind "SharedLib"
|
--kind "SharedLib"
|
||||||
filter "*Static"
|
--filter "*Static"
|
||||||
kind "StaticLib"
|
kind "StaticLib"
|
||||||
filter "kind:StaticLib"
|
--filter "kind:StaticLib"
|
||||||
defines { "_LIB" }
|
-- defines { "_LIB" }
|
||||||
removedefines { "_USRDLL", "_DLL" }
|
-- removedefines { "_USRDLL", "_DLL" }
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user