LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

linux WIP

Browse source
This commit is contained in:
Mikulas Florek 2020-02-09 12:01:50 +01:00
parent 59f21f841b
commit 948a0aced9
2 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
projects/genie.lua
View file

@ -320,6 +320,21 @@ function linkPhysX()
"PhysXVehicle_static_64",
"PhysX_static_64"
}
configuration { "linux" }
libdirs {"../external/physx/lib/linux64_gmake/release"}
links {
"PhysX_static_64",
"PhysXCharacterKinematic_static_64",
"PhysXCommon_static_64",
"PhysXCooking_static_64",
"PhysXExtensions_static_64",
"PhysXFoundation_static_64",
"PhysXPvdSDK_static_64",
--"PhysXTask_static_64",
"PhysXVehicle_static_64",
--"SceneQuery_static_64",
--"SimulationController_static_64"
}
configuration {}
libdirs {"../external/physx/lib/" .. binary_api_dir .. "/win64/release_static"}
@ -346,6 +361,21 @@ function linkPhysX()
"SceneQuery_static_64",
"SimulationController_static_64"
}
configuration { "linux" }
libdirs {"../external/physx/lib/linux64_gmake/release"}
links {
"PhysX_static_64",
"PhysXCharacterKinematic_static_64",
"PhysXCommon_static_64",
"PhysXCooking_static_64",
"PhysXExtensions_static_64",
"PhysXFoundation_static_64",
"PhysXPvdSDK_static_64",
--"PhysXTask_static_64",
"PhysXVehicle_static_64",
--"SceneQuery_static_64",
--"SimulationController_static_64"
}
configuration { "Debug" }
libdirs {"../external/physx/lib/" .. binary_api_dir .. "/win64/release"}
@ -411,6 +441,7 @@ solution "LumixEngine"
}
linkoptions {
"-Wl,--gc-sections",
"-fopenmp"
}
configuration {}

5
src/engine/mt/linux/atomic.cpp
View file

@ -11,6 +11,11 @@ i32 atomicIncrement(i32 volatile* value)
return __sync_fetch_and_add(value, 1) + 1;
}
i64 atomicIncrement(i64 volatile* value)
{
return __sync_fetch_and_add(value, 1) + 1;
}
i32 atomicDecrement(i32 volatile* value)
{
return __sync_fetch_and_sub(value, 1) - 1;