sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build: Make some fixes in order to prepare static building 

Still not linking though


Former-commit-id: 3962a663c9368ea78c4703cc860beef8c440bb4b [formerly b9575a870528ef6712500a94c5223a74d5c6dbec] [formerly bf2ab7b17b25479d6a8fda660e8d9055ffce38de [formerly 3db6f9cbf4cedd9f91ef8f7f1bcc99a4e84027a4]]
Former-commit-id: 0c292fec84d1963f377d16d5e9a15337bef4620f [formerly 93c016fa10c60bf11e4b0b1e17d8c98a66dfa028]
Former-commit-id: 712b1bf14355a82be4cc2c37912f87039b3d9616
This commit is contained in:
Lynix 2016-09-27 18:10:13 +02:00
parent 29ac52770e
commit 3875d2abe2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SDK/include/NDK/Prerequesites.hpp
View File

@ -33,7 +33,7 @@
// Importation/Exportation of the API // Importation/Exportation of the API
#if defined(NAZARA_PLATFORM_WINDOWS) #if defined(NAZARA_PLATFORM_WINDOWS)
#if !defined(NDK_STATIC) #if !defined(NAZARA_STATIC)
#ifdef NDK_BUILD #ifdef NDK_BUILD
#define NDK_API NAZARA_EXPORT #define NDK_API NAZARA_EXPORT
#else #else
@ -43,7 +43,7 @@
#define NDK_API #define NDK_API
#endif #endif
#elif defined(NAZARA_PLATFORM_LINUX) #elif defined(NAZARA_PLATFORM_LINUX)
#if !defined(NDK_STATIC) && defined(NAZARA_COMPILER_GCC) #if !defined(NAZARA_STATIC) && defined(NAZARA_COMPILER_GCC)
#define NDK_API NAZARA_EXPORT #define NDK_API NAZARA_EXPORT
#else #else
#define NDK_API #define NDK_API

6
build/scripts/common.lua
View File

@ -228,6 +228,7 @@ function NazaraBuild:Execute()
targetdir("../lib/xcode/x64") targetdir("../lib/xcode/x64")
configuration("*Static") configuration("*Static")
defines("NAZARA_STATIC")
kind("StaticLib") kind("StaticLib")
configuration("*Dynamic") configuration("*Dynamic")
@ -357,6 +358,9 @@ function NazaraBuild:Execute()
targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x64") targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x64")
end end
configuration("*Static")
defines("NAZARA_STATIC")
if (toolTable.Kind == "library" or toolTable.Kind == "plugin") then if (toolTable.Kind == "library" or toolTable.Kind == "plugin") then
configuration("*Static") configuration("*Static")
kind("StaticLib") kind("StaticLib")
@ -705,7 +709,7 @@ function NazaraBuild:MakeInstallCommands(infoTable)
end end
if (os.is("windows")) then if (os.is("windows")) then
configuration({}) configuration("*Dynamic")
for k,v in pairs(self.InstallDir) do for k,v in pairs(self.InstallDir) do
local destPath = path.translate(path.isabsolute(k) and k or "../../" .. k) local destPath = path.translate(path.isabsolute(k) and k or "../../" .. k)