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.

Sign up for GitHub

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

Jump to bottom

Continue Linux port #250

Merged
merged 540 commits into from
Oct 10, 2018
Merged

Continue Linux port #250

merged 540 commits into from
Oct 10, 2018

Conversation

Zegeri
Copy link
Contributor

@Zegeri Zegeri commented Oct 8, 2018 •
edited
Loading

This a big pull request. Fortunately, most of the changes are the inclusion of a platform independent delimiter for file paths and the renaming of header includes for the case-sensitive Linux. An incomplete list of general changes:

  • Compilation support of most of the project in GCC and Clang
  • More prevalent use of SDL ( ac669b5 )
  • Better error messages ( 6cfd99f )
  • Running the game up to GLSL Shaders compilation if you use Mesa drivers
  • Running the game up to xrScriptEngine initialization if you use NVIDIA propietary driver
  • Some code simplification ( cace3a3 )

Potential issues:

  • The usage of sscanf instead of sscanf_s might cause trouble.
  • The Linux build might take too much time and exhaust Travis limit.

eagleivg and others added 30 commits August 2, 2018 16:50
@eagleivg
xrCore,xrCDB: replace cpu features on SDL
ac669b5
@eagleivg
xrCore: fix locating fs patches
8f0a17d
@eagleivg
xrCore: fix linux xr_strlwr
61ce3df
@q4a
Update Linux build dependencies
1d111bc
@eagleivg
Revert "xrCore: fix linux xr_strlwr"
d6c3543 
This reverts commit 61ce3df.
@eagleivg
xrCDB,xrCore: fix win build
5037b4b
@q4a
Update Linux build dependencies: FreeImage
313b87e
@q4a
Update CMake build config. Add dependencies: FreeImage, LockFile, Ope…
3dd448d 
…nAL, TBB
@q4a
fix error "cannot find -lluajit-debug" when typinf "cmake .." twice
3e53420
@q4a
add dirty hack for linux build in howto build-linux.txt
33d1643
@q4a
update luabind to q4a/luabind-deboostified branch xray_new
2e1121f
@eagleivg
Linux build: add SDL2 includes for build on gentoo-based distrs
1dfaaaa
@eagleivg
Linux build: fix misstype in xrCDB CMake
3854ed9
@eagleivg
CMake: now using lib & includes, found by CMake
d16dfa5
@eagleivg
CMake: reworked SDL2 lookup & update depended projects
29bb39f
@q4a
use github.com/LuaJIT/LuaJIT with custom luajit.cmake in Externals
2e06299
@eagleivg
CMake, SDL2: remove unnesesary SDL.h includes
f5e1f6c
@eagleivg
CMake: fix SDL include for xrPhysics
21daea1
@q4a
fix windows build after update LuaJIT
28325e3
@q4a
Fix windows build after update LuaJIT. Part 2
036e80d
@eagleivg
Merge branch 'xd_dev' of github.com:Xottab-DUTY/xray-16 into linux
81576fd
@eagleivg
xrGame: fix case-sensitivity includes for Linux build
d43a305
@eagleivg
xrServerEntities: fix case-sensitivite includes
0ad7e6b
@eagleivg
linux build: add MSDN COM __interface replacement
d560068
@eagleivg
xrEngine: return xr_pure_interface members in linux build
6bb419e
@eagleivg
xrEngine: return xr_pure_interface IPhDebugRender in linux build
444d0e1
@eagleivg
xrGame: add missing typename for linux build
a5eb38d
@eagleivg
xrGame: fix windows build
1970cc2
@eagleivg
xrGame: fix windows linkage
773622a
@eagleivg
xrCore: add run-time replacement for linux-specific path separator
2152c23
Zegeri and others added 23 commits October 6, 2018 15:05
@Zegeri
xrUICore: Add xr_install in cmake
92c55bb
@eagleivg
Merge pull request #12 from Zegeri/sync
c7486d4 
 Merge branch OpenXRay/xd_dev and fix conflicts
@q4a
fix Linux Debug build
d55dfee
@Xottab-DUTY @q4a
Added ReSharper caches to .gitignore
7a5a669
@qweasdd136963 @q4a
Trying to fix GitInfo
199cc4e
@q4a
remove autosaved file Actor_Network.cpp.autosave
2905393
@q4a
use q4a's auth_token for AppVeyor
e612b8c
@q4a
remove linux stuff from commented-out code
7a6e4aa
@q4a
update luabind to lastest state
a83f1e7
@q4a
remove unneded stuff
a472cb2
@Xottab-DUTY @q4a
xrRender_RX: removed software processor from details manager
622357d 
It was only used when your GPU doesn't support the vertex shaders....
@eagleivg
xrCore: implement getting work and app path on linux
3f2b311
@q4a
remove #if !defined (_MSC_VER)
c0e260c
@qweasdd136963 @q4a
Game objects testing functions replaced with game object casting (e.g…
725ba29 
…. 'bool is_car' -> 'CCar* cast_Car')
@qweasdd136963 @q4a
Added new console commands: set_weather, r__sunshafts_intensity
aaf3df8
@qweasdd136963 @q4a
Added new startup command "-force_flushlog". Allows write to log file…
279c86f 
… immediately (Thx alpet, RvP)

Environment_misc: fixed formatting
Added USE_LOG_TIMING. When used, log message is written in the following format: '[H:M:S.MS] log msg' (e.g. '[16:09:58.603] Loading DLL: xrRender_R2')
@Xottab-DUTY @q4a
xrRender/D3DUtils.cpp: replaced D3DPT_TRIANGLEFAN with D3DPT_TRIANGLE…
adc3448 
…STRIP

xrRender/r__sector.cpp: removed unnecessary macro usage, it's better to
directly use xr_vector.
@Xottab-DUTY @q4a
Probably fixed problems with allocation/deallocation of std::locale
ff133f2
@q4a
fix building luabind
3aba32d
@q4a
fix Linux build after cherry-pick from upstream
d78bf9d
@q4a
fix ? symbols
0de8a60
@Zegeri
README: Use OpenXRay's Continuous Integration
6357979
@Xottab-DUTY
Merge branch 'xd_dev' into linux-merge
a7f2240
@Xottab-DUTY Xottab-DUTY merged commit 686f5db into OpenXRay:xd_dev Oct 10, 2018
@Xottab-DUTY Xottab-DUTY added this to In progress in Linux port via automation Oct 11, 2018
@Xottab-DUTY Xottab-DUTY added this to the Linux port milestone Oct 11, 2018
@Xottab-DUTY Xottab-DUTY moved this from In progress to Done in Linux port Oct 11, 2018
@q4a q4a deleted the linux-merge branch March 25, 2020 01:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Linux Portability
Projects
Roadmap
Status: Done
Linux port
  
Done
Milestone
Linux port
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Zegeri @Xottab-DUTY @eagleivg @q4a @a1batross @qweasdd136963