Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Continue Linux port #250

Merged
merged 540 commits into from
Oct 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
540 commits
Select commit Hold shift + click to select a range
ac669b5
xrCore,xrCDB: replace cpu features on SDL
eagleivg Aug 2, 2018
8f0a17d
xrCore: fix locating fs patches
eagleivg Aug 2, 2018
61ce3df
xrCore: fix linux xr_strlwr
eagleivg Aug 2, 2018
1d111bc
Update Linux build dependencies
q4a Aug 2, 2018
d6c3543
Revert "xrCore: fix linux xr_strlwr"
eagleivg Aug 2, 2018
5037b4b
xrCDB,xrCore: fix win build
eagleivg Aug 2, 2018
313b87e
Update Linux build dependencies: FreeImage
q4a Aug 4, 2018
3dd448d
Update CMake build config. Add dependencies: FreeImage, LockFile, Ope…
q4a Aug 4, 2018
3e53420
fix error "cannot find -lluajit-debug" when typinf "cmake .." twice
q4a Aug 4, 2018
33d1643
add dirty hack for linux build in howto build-linux.txt
q4a Aug 7, 2018
2e1121f
update luabind to q4a/luabind-deboostified branch xray_new
q4a Aug 7, 2018
1dfaaaa
Linux build: add SDL2 includes for build on gentoo-based distrs
eagleivg Aug 7, 2018
3854ed9
Linux build: fix misstype in xrCDB CMake
eagleivg Aug 7, 2018
d16dfa5
CMake: now using lib & includes, found by CMake
eagleivg Aug 7, 2018
29bb39f
CMake: reworked SDL2 lookup & update depended projects
eagleivg Aug 7, 2018
2e06299
use github.com/LuaJIT/LuaJIT with custom luajit.cmake in Externals
q4a Aug 8, 2018
f5e1f6c
CMake, SDL2: remove unnesesary SDL.h includes
eagleivg Aug 8, 2018
21daea1
CMake: fix SDL include for xrPhysics
eagleivg Aug 8, 2018
28325e3
fix windows build after update LuaJIT
q4a Aug 10, 2018
036e80d
Fix windows build after update LuaJIT. Part 2
q4a Aug 10, 2018
81576fd
Merge branch 'xd_dev' of github.com:Xottab-DUTY/xray-16 into linux
eagleivg Aug 12, 2018
d43a305
xrGame: fix case-sensitivity includes for Linux build
eagleivg Aug 12, 2018
0ad7e6b
xrServerEntities: fix case-sensitivite includes
eagleivg Aug 12, 2018
d560068
linux build: add MSDN COM __interface replacement
eagleivg Aug 12, 2018
6bb419e
xrEngine: return xr_pure_interface members in linux build
eagleivg Aug 12, 2018
444d0e1
xrEngine: return xr_pure_interface IPhDebugRender in linux build
eagleivg Aug 12, 2018
a5eb38d
xrGame: add missing typename for linux build
eagleivg Aug 13, 2018
1970cc2
xrGame: fix windows build
eagleivg Aug 13, 2018
773622a
xrGame: fix windows linkage
eagleivg Aug 18, 2018
2152c23
xrCore: add run-time replacement for linux-specific path separator
eagleivg Aug 18, 2018
277dab3
xrCore: fixed linux FS (open/read archives)
eagleivg Aug 19, 2018
1281255
xrManagedApi: fix windows build
eagleivg Aug 19, 2018
d4525f7
xrCore: fix archive patches at registry
eagleivg Aug 19, 2018
a29d838
Linux: rewrite _splitpath implementation
eagleivg Aug 20, 2018
18e012f
LW_Shader: fix win build
eagleivg Aug 20, 2018
779c065
lw: fix compile error
eagleivg Aug 20, 2018
4ea4f93
Common: fixed all found call xrCore::Initialize()
eagleivg Aug 20, 2018
9971980
xrCore: add print stack trace in linux
eagleivg Aug 22, 2018
6cfd99f
xrCore: remove some xr_strlwr for properly use of case-sensitive file…
eagleivg Aug 22, 2018
1d4e485
xrGame, xrServerEntities: fix some temaplate for linux build
eagleivg Aug 24, 2018
37b7b48
xrGame: fix some templates for linux build
eagleivg Aug 24, 2018
2fe3fb2
xrEngine: reject net auth for Linux build
eagleivg Aug 27, 2018
ad96be5
xrGame:fix windows build
eagleivg Aug 27, 2018
6f16313
xrRenderPC_R1: fix case-sensitive includes
eagleivg Aug 27, 2018
7c54c5d
xrRenderPC_GL: fix case-sensitive includes
q4a Aug 27, 2018
3537efd
xrEngine: fix crash on linux
eagleivg Aug 29, 2018
f69af7d
xrCore: fix loading archive resourses on windows
eagleivg Aug 29, 2018
b6ebc6f
cmake: fix possible LUA_LIBRARIES variable loss, when CMAKE_BUILD_TYP…
a1batross Sep 6, 2018
ed2082c
Merge pull request #1 from a1batross/linux
Sep 7, 2018
bce8888
change submodule url from q4a/luabind-deboostified to OpenXRay/luabin…
q4a Sep 8, 2018
856b6c4
update luabind to lastest commit f980d11
q4a Sep 8, 2018
aabde60
remove dirty hack. Don't delete cryptopp
q4a Sep 8, 2018
d748415
update lastest luabind state
q4a Sep 8, 2018
04806c9
remove an erroneous binary file
q4a Sep 8, 2018
91cec90
update lastest luabind state. Again
q4a Sep 8, 2018
a311a0d
remove temporary for cryptopp
q4a Sep 8, 2018
7bd4385
use system crypto++ instead of compiling from source code
q4a Sep 9, 2018
5836b65
Fix explicit specialization in non-namespace scope
Zegeri Sep 7, 2018
8506cbc
Fix invalid pure virtual function declaration
Zegeri Sep 7, 2018
24f6bc3
"#pragma once" doesn't need semicolon
Zegeri Sep 7, 2018
9c84cce
Remove unnecesary typenames GCC doesn't like
Zegeri Sep 8, 2018
b6be30b
xrScriptEngine: fix luabind's call_member call on GCC
a1batross Sep 9, 2018
4d9a3c2
xrGame: declare enum forward declarations with u32 for standard compl…
a1batross Sep 9, 2018
326f63b
xrAICore: Fix unknown enum and unnecesary typename
Zegeri Sep 9, 2018
d14b08d
Loki: Implement simpler Typelist (move later to a better location)
Zegeri Sep 9, 2018
daf0085
Loki: Implement simpler HierarchyGenerators (move later)
Zegeri Sep 9, 2018
4de9a86
xrAICore: Add missing template keyword
Zegeri Sep 9, 2018
918218f
xrGame: Fix case sensitive #includes
Zegeri Sep 8, 2018
d5d013d
Use Loki::EmptyType instead of Loki::NullType
Zegeri Sep 10, 2018
8971a83
xrGame: Other minor fixes for GCC
Zegeri Sep 12, 2018
038e76c
xrGame: Fix more case sensitive #includes
Zegeri Sep 12, 2018
cace3a3
xrGame: Refactor alife_registry_container's helper class
Zegeri Sep 12, 2018
ef663de
xrGame: Exclude some files from CMake build
Zegeri Sep 13, 2018
3fdf11d
xrGame: Add missing external libraries to CMakeLists
Zegeri Sep 13, 2018
f1852c8
Replace ambiguous include
Zegeri Sep 14, 2018
4b4e63b
Remove unnamed struct
Zegeri Sep 14, 2018
24697f8
Fix CIniTable's convert function for ISO C++
Zegeri Sep 14, 2018
a902b75
xrGame: Avoid all the remaining issues by "#ifndef LINUX"
Zegeri Sep 14, 2018
2e5ee9c
Fix various minor issues
Zegeri Sep 14, 2018
d0989ff
Fix issue with non-template derived member variables
Zegeri Sep 14, 2018
facb9a6
Avoid conflicting macros with cximage
Zegeri Sep 16, 2018
9770522
xrGame: Fix const-less function pointer cast
Zegeri Sep 16, 2018
90d4a1d
Add a 3 arguments overload of strncpy_s
Zegeri Sep 16, 2018
a7e4f40
xrGame: Don't use the name of a template as its alias (causes warning)
Zegeri Sep 16, 2018
e04dd5f
xrGame: More minor fixes
Zegeri Sep 16, 2018
e5da009
xrGame: Use xdg-open to open url links on Linux
Zegeri Sep 16, 2018
1a56f03
xrGame: No DLL APIENTRY on Linux
Zegeri Sep 16, 2018
7119e15
xrGame: Adapt game state accumulator to new Typelist
Zegeri Sep 16, 2018
2cbf6c0
xrGame: Explicit narrowing u32-int cast (ugly)
Zegeri Sep 16, 2018
b122b5b
xrGame: Adapt sscanf_s for ISO C++ (dangerous)
Zegeri Sep 12, 2018
b8213f7
Activate xrGame build in CMake
Zegeri Sep 16, 2018
18066ca
travis: Upgrade g++-5 back to g++-7
Zegeri Sep 17, 2018
5fb4803
xrGame: hide major version SDL calls
eagleivg Sep 17, 2018
bf1dac9
xrGame: replace sscanf_s to sscanf
eagleivg Sep 17, 2018
b2514bc
CMake: now compile cximage with -fPIC
eagleivg Sep 17, 2018
8f721a8
Merge pull request #2 from Zegeri/clean
Sep 17, 2018
f058208
CMAKE: add error message if you are trying to build engine with gcc v…
q4a Sep 17, 2018
d4e58e1
Add cotire module to cmake to create precompiled headers
Zegeri Sep 17, 2018
da52591
Fix a mistake and simplify LoadItemData as suggested by @ForserX
Zegeri Sep 17, 2018
4c0a5ba
Configure ccache to work with precompiled headers
Zegeri Sep 17, 2018
0fe4d3e
Add -Wno-attributes to CXX flags
q4a Sep 18, 2018
d5da513
Merge pull request #3 from Zegeri/clean
eagleivg Sep 18, 2018
71c3a08
xrGame: fix some warnings for cotire build
eagleivg Sep 18, 2018
ed249cc
Revert Typelist reimplementation and try a simpler approach
Zegeri Sep 18, 2018
9791c47
Tell MSVC to not look for stdafx.h in PHNetState.cpp
Zegeri Sep 18, 2018
68da2f3
Comment out _strlwr_l and _strupr_l (create lots of warnings)
Zegeri Sep 18, 2018
8fd3b87
Remove macros inside of SCRIPT_EXPORT macro
Zegeri Sep 18, 2018
6cb41f5
Merge pull request #4 from Zegeri/clean
eagleivg Sep 19, 2018
5783492
xrGame: fix include path for win build
eagleivg Sep 19, 2018
2b2c30d
xrGame, xrAICore: fix more warnings
eagleivg Sep 19, 2018
9d3109f
xrGame: enable C++17 in project settings
eagleivg Sep 19, 2018
8eec56e
xrGame: fix get_description and get_loophole
eagleivg Sep 19, 2018
f423725
xrGame: fix is_interactive_motion and get_moving_objects
eagleivg Sep 19, 2018
9169e3e
Remove "noexcept" in the type when passing a function to luabind
Zegeri Sep 20, 2018
9d0e0e8
Comment out noexcept specifier in functions that are passed to luabind
Zegeri Sep 20, 2018
46ee695
Merge pull request #5 from Zegeri/clean
eagleivg Sep 21, 2018
90c9087
xrAICore: try fix linkage for CAI_ObjectLocation members
eagleivg Sep 21, 2018
490a139
xrGame,xrAICore: fix windows linkage. Game not playable yet!!!(wrong
eagleivg Sep 21, 2018
c99ec1a
All "bin*" folders ignoring now. You can use it for bin_debug or bin_…
q4a Sep 22, 2018
9a56e94
Fix luajit lib name when building Debug. Remove set LUA_FOUND 1
q4a Sep 22, 2018
42e9926
small fix for x86 on linux
q4a Sep 22, 2018
eaedc1c
message "CMake build .." now include C/C++ build flags
q4a Sep 22, 2018
757523c
add more cmake options to build-linux.txt
q4a Sep 22, 2018
a836b3d
DOC: fix libreadline dependency
q4a Sep 22, 2018
a66bfbf
DOC: add another make command
q4a Sep 22, 2018
966a40b
LINUX, X86: fix x86 linux building
q4a Sep 22, 2018
5504fe1
xrCore: fix define conditions
eagleivg Sep 22, 2018
9efb872
xrCore: fix xr_token size, game now playable!
eagleivg Sep 22, 2018
cd1463b
remove 2nd #define _finddata_t
q4a Sep 22, 2018
47ec343
add x86 Linux build to travis
q4a Sep 22, 2018
c962d44
update README with new arch statuses
q4a Sep 22, 2018
0802796
Remove unused files after returning original std::unordered_map
q4a Sep 23, 2018
30f6423
update to lastest luabind commit
q4a Sep 23, 2018
26f873d
DOC: we don't need to delete cryptopp
q4a Sep 23, 2018
b1aaba6
README should show status of linux branch. Fixed for appveyor
q4a Sep 24, 2018
913f619
Fix TBB and Clang compiler issue
Zegeri Sep 24, 2018
d57d607
Fix issues with inherited method from templated base classes
Zegeri Sep 24, 2018
6d2f0f9
Fix various minor mistakes that clang doesn't like
Zegeri Sep 24, 2018
2c243df
Do not use shared_str directly on printf
Zegeri Sep 24, 2018
04893d8
Fix Clang's more sensitive header order and forward declarations
Zegeri Sep 24, 2018
960761c
POSIX's 'open' returns int.
Zegeri Sep 24, 2018
373d997
Do not pass a pointer to an temporary IReader in CInifile
Zegeri Sep 24, 2018
9b8d3cb
Remove non defined and obsolete CXML_IdToIndex parameters
Zegeri Sep 24, 2018
107f78b
Remove keyword 'register', which is obsolete and ignored
Zegeri Sep 24, 2018
5a5e0cc
Remove unused ill-formed constructor that Clang complains about
Zegeri Sep 24, 2018
5badae3
Reduce amount of warnings by moving CAI_ObjectLocation::init
Zegeri Sep 24, 2018
b02dda3
Merge pull request #6 from Zegeri/clang-support
q4a Sep 24, 2018
1cbd1e7
fix Windows build after merge
q4a Sep 24, 2018
95f97c5
Activate DEBUG when CMAKE_BUILD_TYPE=Debug
Zegeri Sep 27, 2018
635f82a
Ignore some unused files in CMake build
Zegeri Sep 27, 2018
13b0766
Mark some stuff as FIXMEs for a later time
Zegeri Sep 27, 2018
cc46ec3
xrGame: Use standard try-catch blocks
Zegeri Sep 27, 2018
e05f7bd
Avoid conflicting definitions with cximage and add include folder
Zegeri Sep 27, 2018
d6ee7a1
Fix some includes, template issues and other stuff when DEBUG is on
Zegeri Sep 27, 2018
e62906c
use #pragma once instead of #ifndef-#define in xrPhysics
q4a Sep 28, 2018
d3e0a10
resume #define DISABLING_PARAMS_H and MATH_UTILS_H. We need merge xrP…
q4a Sep 28, 2018
425ce0a
do not include ai_object_location.h in xrGame/StdAfx.h. Fixed "xrAICo…
q4a Sep 29, 2018
39f9f5c
Update travis file from linux_debug. Enable GCC Debug build
q4a Sep 29, 2018
e5783dd
Add "#undef registry_type_list" to fix GCC warnings
q4a Sep 29, 2018
42a0784
Common: add some DX3D types for render
eagleivg Sep 27, 2018
14ad749
xrRenderPC_GL: fix includes case
eagleivg Sep 27, 2018
d89c35e
xrRenderPC_GL: fix some compilation error
eagleivg Sep 28, 2018
f6c701e
Common: update PlatformLinux.inl
eagleivg Sep 28, 2018
947db1d
xrCore: reformat _std_extensions
eagleivg Sep 28, 2018
bd553a0
xrRender: fix includes
eagleivg Sep 28, 2018
2a49ff9
xrRender: fix some linux compilation error (templates and typenames)
eagleivg Sep 28, 2018
0bc733d
CMake: update xrRenderPC_GL build settings
eagleivg Sep 28, 2018
cb65b4e
Enable xrRenderPC_GL cmake build. Add "typedef enum _D3DTEXTURETRANSF…
q4a Sep 29, 2018
9766763
Replace std::sinf to sinf. More Linux header fix
q4a Sep 29, 2018
d9afc98
xrRender: fix build r1-r4 renders
eagleivg Sep 29, 2018
8205d59
Add "typedef struct _D3DRECT" from wine. Small linux header fix
q4a Sep 29, 2018
e108808
xrRender: fix templates typedef. Author: eagleivg
q4a Sep 29, 2018
49fd484
xrRender: portion of fixes linux compile errors, and small refactor
eagleivg Sep 29, 2018
580e0dc
xrRenderPC_GL: now can build (not linking) on linux
eagleivg Sep 29, 2018
cb86246
xrRenderPC_GL: fix linking
eagleivg Sep 29, 2018
6ac703d
xrRender: rename linux dll to xrRender_GL, fix windows build, fixed l…
eagleivg Sep 29, 2018
59086d0
xrRender_GL: add blenders to build, fix linking libglew
eagleivg Sep 29, 2018
6728a54
xrRender_GL: now dll is loaded without error on linux
eagleivg Sep 29, 2018
62e6899
Add libglew-dev to travis config
q4a Sep 29, 2018
c653fc4
add GLEW to build dependencies in cmake and doc
q4a Sep 29, 2018
cd0799e
Rename getStatus to GetStatus
q4a Sep 29, 2018
319918e
Comment out pragma messages about platform and compiler in OPCODE
q4a Sep 29, 2018
d7bfb4b
Fix converting a string constant to char*
q4a Sep 29, 2018
8e3d1c6
Fix warning: #pragma once in main file
q4a Sep 29, 2018
cba90d9
Fix warning: extra tokens at end of #else or #endif directive
q4a Sep 29, 2018
de39a67
Fix error (debug build): narrowing conversion of ‘(CBlend::ECurvature…
q4a Sep 30, 2018
3b3bab3
Fix linking xrRenderPC_GL with LuaJIT on debug build
q4a Sep 30, 2018
d9988e3
Add doxyfile for the documentation generator doxygen
Zegeri Sep 29, 2018
a453e22
add -pipe flag to CXX
q4a Sep 30, 2018
43f58da
Fix doxygen output folder in .gitignore
Zegeri Sep 30, 2018
1bf9d60
Merge pull request #11 from Zegeri/doxygen
q4a Sep 30, 2018
0c38a21
Merge branch xd_dev up to commit '23ba42b8511c'
Zegeri Sep 30, 2018
ce5510e
Some post-merge fixes
Zegeri Sep 30, 2018
9451e96
Merge branch 'xd_dev' of https://github.com/OpenXRay/xray-16 into sync
Zegeri Sep 30, 2018
87b3b8b
Second post-merge fixes
Zegeri Oct 1, 2018
5365fe6
Add xrUICore to cmake and fix builds
Zegeri Oct 1, 2018
b177189
xrRender: Clang is more strict with integer narrowing
Zegeri Oct 1, 2018
de200eb
cmake: set skip rpath on build stage, add easy install wrapper
a1batross Oct 2, 2018
a22e204
cmake: add xr_install where it's needed
a1batross Oct 2, 2018
1798bc6
xrCore: append .so when loading modules
a1batross Oct 2, 2018
4f57ece
xr_3da: add sample run shell script. Install it with binaries.
a1batross Oct 2, 2018
84bbe74
xrGame: fix copy-paste
eagleivg Oct 3, 2018
f26a002
xrGame: fix linux linkage IPureClient and IPureServer (just dumb clas…
eagleivg Oct 3, 2018
0e8e009
Fix case-sensitive includes in shader files
Zegeri Oct 3, 2018
758808e
xrGame: fix linux linkage of le_function
eagleivg Oct 3, 2018
98372be
xrGame: fix linkage ge_function by @Zegeri
eagleivg Oct 3, 2018
21d6519
xrCore: replace Module load file postfix on std:string
eagleivg Oct 3, 2018
88193f6
xrNetServer: add new project to linux build
eagleivg Oct 3, 2018
dc55bdb
xrNetServer: fix includes in dumb classes
eagleivg Oct 4, 2018
fc530f0
CMake: return LUA_FOUND for properly luajit linkage
eagleivg Oct 4, 2018
310673a
gamedata: rename gl shader to lower-case
eagleivg Oct 4, 2018
c4efd92
xrRenderPC_GL: Add platform-specific delimiter to shader path
Zegeri Oct 3, 2018
c03aa99
LocatorAPI: Register files recursively in Recurse
Zegeri Oct 3, 2018
6f881ce
Replace sprintf_s with xr_sprintf
Zegeri Oct 3, 2018
233bb1e
xrRenderPC_GL: Replace '\'->'/' when loading shader includes in non-W…
Zegeri Oct 3, 2018
d33ddea
Force a nullptr check when loading the OpenGL shader folder
Zegeri Oct 3, 2018
1b5bf40
xrGame: add initialize library while dll loading under linux
eagleivg Oct 5, 2018
301e2e4
xrGame: implement reading palyer username from /etc/passwd entry
eagleivg Oct 5, 2018
b2931c3
xrEngine: fix executing case-sensitive cmd arguments
eagleivg Oct 5, 2018
3721a94
xrRender: refactor compare ShaderElements
eagleivg Oct 5, 2018
168f1d4
xrGame: replace \\ to DELIMITER macro
eagleivg Oct 5, 2018
76d8518
xrCore, xrRender, xrEngine, xrNetServer, xrPhysics, xrServerEntities:…
eagleivg Oct 5, 2018
23d96af
xrRender: replace \\ to DELIMITER macro
eagleivg Oct 5, 2018
c66c1b2
xrRender: fix loading shaders&textures
eagleivg Oct 5, 2018
6e9dcd0
xrGame: remove DELIMITER from newline operations
eagleivg Oct 6, 2018
adda390
Add latest q4a/xray-16 linux changes (merge)
Zegeri Oct 6, 2018
cc2203c
xrCore: add to CMake getting git branch and revision for log output
eagleivg Oct 6, 2018
92c55bb
xrUICore: Add xr_install in cmake
Zegeri Oct 6, 2018
c7486d4
Merge pull request #12 from Zegeri/sync
eagleivg Oct 6, 2018
d55dfee
fix Linux Debug build
q4a Oct 6, 2018
7a5a669
Added ReSharper caches to .gitignore
Xottab-DUTY Oct 1, 2018
199cc4e
Trying to fix GitInfo
qweasdd136963 Oct 2, 2018
2905393
remove autosaved file Actor_Network.cpp.autosave
q4a Oct 6, 2018
e612b8c
use q4a's auth_token for AppVeyor
q4a Oct 7, 2018
7a6e4aa
remove linux stuff from commented-out code
q4a Oct 7, 2018
a83f1e7
update luabind to lastest state
q4a Oct 7, 2018
a472cb2
remove unneded stuff
q4a Oct 7, 2018
622357d
xrRender_RX: removed software processor from details manager
Xottab-DUTY Oct 1, 2018
3f2b311
xrCore: implement getting work and app path on linux
eagleivg Oct 7, 2018
c0e260c
remove #if !defined (_MSC_VER)
q4a Oct 7, 2018
725ba29
Game objects testing functions replaced with game object casting (e.g…
qweasdd136963 Oct 2, 2018
aaf3df8
Added new console commands: set_weather, r__sunshafts_intensity
qweasdd136963 Oct 2, 2018
279c86f
Added new startup command "-force_flushlog". Allows write to log file…
qweasdd136963 Oct 6, 2018
adc3448
xrRender/D3DUtils.cpp: replaced D3DPT_TRIANGLEFAN with D3DPT_TRIANGLE…
Xottab-DUTY Oct 5, 2018
ff133f2
Probably fixed problems with allocation/deallocation of std::locale
Xottab-DUTY Oct 6, 2018
3aba32d
fix building luabind
q4a Oct 7, 2018
d78bf9d
fix Linux build after cherry-pick from upstream
q4a Oct 7, 2018
0de8a60
fix ? symbols
q4a Oct 7, 2018
6357979
README: Use OpenXRay's Continuous Integration
Zegeri Oct 8, 2018
a7f2240
Merge branch 'xd_dev' into linux-merge
Xottab-DUTY Oct 10, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion Externals/openal/include/openal/alc.h
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,10 @@ typedef void (ALC_APIENTRY *LPALCCAPTURESAMPLES)( ALCdevice *device, A
}
#endif

#if defined(_WIN32) && !defined(_XBOX)
typedef void __cdecl log_fn_ptr_type(char*);
extern ALC_API log_fn_ptr_type* pLog ;

#endif
void AlLog(char* format, ...);

#endif /* AL_ALC_H */
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ and work on the source code.

Changelist is available in [wiki](https://github.com/OpenXRay/xray-16/wiki/Changes).

Build instructions: [doc/howto/build.txt](doc/howto/build.txt)
Build instructions (Windows): [doc/howto/build.txt](doc/howto/build.txt)

Build instructions (Linux): [doc/howto/build-linux.txt](doc/howto/build-linux.txt)

If you find a bug or have an enhancement request, file an [Issue](https://github.com/openxray/xray-16/issues).

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ deploy:
release: OpenXRay (build $(appveyor_build_version))
description: $(APPVEYOR_REPO_COMMIT_MESSAGE)
auth_token:
secure: kGVniXDR926BfVcA97y25BzALbijvgboBsozZzY9yc8RPz15Q4YG474h7vl14/J1
secure: EwMP7ob9Q7cE1EvW72ybDSYjbD44IQRDFhbCQcdOuBSSz9PbO/Pq2ZUNuMqPuvsV
artifact:
OpenXRay.Dx86.7z, OpenXRay.Dx64.7z, OpenXRay.Mx86.7z, OpenXRay.Mx64.7z, OpenXRay.Rx86.7z, OpenXRay.Rx64.7z,
Symbols.Dx86.7z, Symbols.Dx64.7z, Symbols.Mx86.7z, Symbols.Mx64.7z, Symbols.Rx86.7z, Symbols.Rx64.7z
Expand Down
10 changes: 5 additions & 5 deletions sdk/include/loki/HierarchyGenerators.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define HIERARCHYGENERATORS_INC_

#include "Typelist.h"
#include "TypeTraits.h"
#include "TypeManip.h"
#include "EmptyType.h"

namespace Loki
Expand Down Expand Up @@ -158,9 +158,9 @@ namespace Loki
>
::Result TList;

template <typename T> struct Rebind
template <typename U> struct Rebind
{
typedef Unit<T> Result;
typedef Unit<U> Result;
};
};

Expand Down Expand Up @@ -228,7 +228,7 @@ namespace Loki
typedef typename TL::TypeAt<typename H::TList, i>::Result ElementType;
typedef typename H::template Rebind<ElementType>::Result UnitType;

enum { isConst = TypeTraits<H>::isConst };
static constexpr bool isConst = std::is_const_v<H>;

typedef typename Select
<
Expand Down Expand Up @@ -273,7 +273,7 @@ namespace Loki
typedef typename H::TList::Head ElementType;
typedef typename H::template Rebind<ElementType>::Result UnitType;

enum { isConst = TypeTraits<H>::isConst };
static constexpr bool isConst = std::is_const_v<H>;

typedef typename Select
<
Expand Down
28 changes: 3 additions & 25 deletions sdk/include/loki/TypeManip.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,7 @@ namespace Loki
template <bool flag, typename T, typename U>
struct Select
{
private:
template<bool>
struct In
{ typedef T Result; };

template<>
struct In<false>
{ typedef U Result; };

public:
typedef typename In<flag>::Result Result;
using Result = std::conditional_t<flag, T, U>;
};


Expand All @@ -84,20 +74,8 @@ namespace Loki
////////////////////////////////////////////////////////////////////////////////

template <typename T, typename U>
struct IsSameType
{
private:
template<typename>
struct In
{ enum { value = false }; };

template<>
struct In<T>
{ enum { value = true }; };

public:
enum { value = In<U>::value };
};
struct IsSameType : std::is_same<T, U>
{};

////////////////////////////////////////////////////////////////////////////////
// Helper types Small and Big - guarantee that sizeof(Small) < sizeof(Big)
Expand Down
Loading