diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-23 21:14:16 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-23 21:14:16 +0300 |
| commit | 88b6168f1c8af531efa3db6a02752f1674d2ee60 (patch) | |
| tree | 39a2c877a44b6eac8b5fd3238a82e636c5eaadfe /premake5.lua | |
| parent | 5276abb0fb364ace02e16d01a2cf768f94bb4246 (diff) | |
| parent | 100e59886d18db04efe5455cc35c056b69c5d1d3 (diff) | |
Merge branch 'master' into miami
# Conflicts:
# premake5.lua
# src/control/Script.cpp
# src/core/SurfaceTable.cpp
# src/core/config.h
# src/entities/Physical.cpp
# src/entities/Physical.h
# src/objects/Object.h
# src/skel/skeleton.h
# src/vehicles/Vehicle.h
Diffstat (limited to 'premake5.lua')
| -rw-r--r-- | premake5.lua | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/premake5.lua b/premake5.lua index 0f3a03dc..cf9bd2d1 100644 --- a/premake5.lua +++ b/premake5.lua @@ -51,6 +51,9 @@ workspace "reVC" "win-x86-RW33_d3d8-mss", "win-x86-librw_d3d9-mss", "win-x86-librw_gl3_glfw-mss", + "win-x86-RW33_d3d8-oal", + "win-x86-librw_d3d9-oal", + "win-x86-librw_gl3_glfw-oal", } filter { "system:linux" } @@ -184,11 +187,17 @@ project "reVC" includedirs { "src/extras" } includedirs { "eax" } - includedirs { "milessdk/include" } includedirs { "eax" } - - libdirs { "milessdk/lib" } + filter "platforms:*mss" + defines { "AUDIO_MSS" } + includedirs { "milessdk/include" } + libdirs { "milessdk/lib" } + + filter "platforms:*oal" + defines { "AUDIO_OAL" } + + filter {} if(os.getenv("GTA_VC_RE_DIR")) then setpaths("$(GTA_VC_RE_DIR)/", "%(cfg.buildtarget.name)", "") end @@ -200,8 +209,15 @@ project "reVC" characterset ("MBCS") targetextension ".exe" - filter "platforms:linux*" - defines { "OPENAL" } + filter "platforms:win*oal" + includedirs { "openal-soft/include" } + includedirs { "libsndfile/include" } + includedirs { "mpg123/include" } + libdirs { "openal-soft/libs/Win32" } + libdirs { "libsndfile/lib" } + libdirs { "mpg123/lib" } + + filter "platforms:linux*oal" links { "openal", "mpg123", "sndfile", "pthread" } filter "platforms:*RW33*" |