Commit graph

68 commits

Author SHA1 Message Date
Vincent Lejeune a462b4518c d3d12: Move d3d12 files to separate solution.
It simplify solution configurations.
2015-10-17 04:15:58 +02:00
Danila Malyutin 92e90101e2 Fix clang compiling 2015-10-13 23:32:25 +03:00
DH 9136cbfcf2 Fixed compilation errors 2015-10-13 22:47:17 +03:00
DH a7262d34f0 Added glm library 2015-10-05 12:56:05 +03:00
Danila Malyutin 4bf0deecb6 Fix zlib lib linking order.
It should be AFTER lib that requires it.
2015-08-26 14:32:09 +03:00
Danila Malyutin b01583f54b Some fixes for possible *nix compiler errors 2015-08-24 00:20:06 +03:00
Danila Malyutin d0283265cc Improve clock_gettime on osx
and some clean up
2015-08-24 00:20:02 +03:00
Danila Malyutin 009370f73c Fix some compiling problems on OSX
and enable osx builds on travis
2015-08-24 00:20:01 +03:00
Danila Malyutin 7460d215fd Fix travis OoM crash with gcc and -O3
Until with move to containers.
2015-08-16 23:40:09 +03:00
Danila Malyutin 5bf6c25652 Remove unneeded code (fixes flag "conflicts")
cmake should add appropriate flags depending on build type automatically
2015-08-16 23:40:07 +03:00
Danila Malyutin 0fb8ad8c5a Update Cotire to 1.7.3
It fixes some bugs. Also use add_compile_options instead of add_defenitions where necessary
2015-08-16 23:40:05 +03:00
Danila Malyutin 99156c61e4 Fix wrong XAudio lib being linked 2015-08-13 01:12:15 +03:00
Danila Malyutin 570e41f8e0 Small fixes and improvments 2015-08-10 01:59:03 +03:00
Danila Malyutin ddff65d288 Make it possible to build rpcs3 via cmake/vs2015 combo. 2015-08-08 04:43:08 +03:00
Danila Malyutin fafdc213ed Fix OpenAL and and wxWidgets finding on cmake/win 2015-08-07 18:30:08 +03:00
Danila Malyutin 831858ce7e Change jit to mcjit in CMakeLists
This fixes compiling on linux
2015-07-23 10:46:12 +03:00
Nekotekina a77a75660b Compilation fix 2015-06-15 19:21:10 +03:00
luxsie 080e42ec9f Stop overwriting the ADDITIONAL_LIBS setting for CMake. 2015-04-09 00:09:03 +02:00
B1ackDaemon 952098c00f Merge pull request #1046 from Nekotekina/new_interpreter
Alternative interpreters
2015-04-04 20:03:18 +03:00
Joshua Clark 10983338d8 Small fixes to allow compililation on linux 2015-03-31 03:34:37 -05:00
Nekotekina f095dec43d Compilation fix 2015-03-22 02:22:24 +03:00
Nekotekina 8587ae5883 Compilation fix 2015-03-03 02:34:49 +03:00
Peter Tissen a404f2e6fa Add iconv to linked libs on non-linux UNIX
of course the correct solution would be to actually search for the symbols
but that seems like a lot of efford just for the sake of doing it right.
This should probably suffice for all relevant platforms for now.
2015-02-18 19:30:04 +01:00
Peter Tissen 518c028a3d Only link to librt on Linux
The library is not needed on OSX and does not seem to exists there
2015-02-18 15:59:26 +01:00
Peter Tissen 068883a441 Add librt to the list of linked libraries
This is needed by `shm_unlink` and similar functions. Fixes #997
2015-02-11 00:44:22 +01:00
Dante38490 e61849c3c4 Fix correct name file 2015-01-15 04:16:14 +01:00
Peter Tissen 71225da135 don't distinguish between windows and unix for no reason 2015-01-15 03:34:03 +01:00
Fabian Schaffert f507724b5c Fixes build in Debug mode on linux
The changes introduced in commit 80294e1 makes the mcdisassembler
component of LLVM necessary in debug mode to successfully link rpcs3.
2014-11-15 21:30:01 +01:00
Hykem 5a27a84f5a Merge branch 'master' of https://github.com/gopalsr83/rpcs3 into gopalsr83-master 2014-11-04 16:45:25 +00:00
gopalsr83 1446e5bb50 Made changes for compiling in Linux 2014-10-21 16:06:10 +05:30
S Gopal Rajagopal 4514fc12bd Updated Travis CI configuration to compile LLVM 2014-10-21 02:17:00 +05:30
gopalsr83 d5e86f7190 Fixed compilation in Linux. Have not tested it though. 2014-10-13 15:40:39 +05:30
Peter Tissen afe493f187 use a include directory relatie to the lists file 2014-07-23 19:51:41 +02:00
boxingcow 10647890ef There is a special place in hell for 'Smart Dashes' 2014-07-13 18:51:19 +01:00
boxingcow 3c8084b2c7 Stupid mistake. 2014-07-13 09:31:11 +01:00
boxingcow b7b3761c09 Add include path for XQuartz on OS X 2014-07-12 22:10:49 +01:00
Sacha 6e06fdf638 Stdafx: Major header cleanup 2014-07-12 16:33:04 +10:00
Sacha f256153a2b Warnings: Fix several warnings. 2014-07-11 05:08:05 +10:00
Sacha 6b148d1d4c CMake: Improve to support build type. Default to release. 2014-07-11 02:46:10 +10:00
Hykem bd6837f2f9 Merge pull request #216 from UnconventionalT/binary-dir-fix
Set build independent binary output dir
2014-06-09 01:36:15 +01:00
Peter Tissen c37905e465 initial start to eliminate static func init, not compilable atm
move module initialization into a module manager, still has some issues like stopping not working and debug crashing

add #idef 0 to modules that aren't in the windows project

don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors

remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable

add secondary project, no real use for it now

add some memleak config to the emucore and add asmjit path to rpcs3

small rebase error fixed to get it to compile again

add filters for emucore

re-add the module manager and static file

WIP commit, linker errors abound

some more abstraction layer stuff

fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers

rebasing

fix memset undefined and re() usage of se_t before declaration

Add wxGUI define by default for cmake builds

fix copy constructors of Datetime header

fix copy constructors of other wx interface classes

remove static declarations of global variables

make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls

remove duplicate definition for FromUTF8 and ToUTF8

temp changes
2014-06-08 23:16:06 +02:00
Peter Tissen 8da681eab2 enable cotire for better build-times 2014-06-06 03:33:24 +02:00
Alexandro Sánchez Bach 111da4d0fd Removed 32-bit config. from .SLN and CMakeLists 2014-06-02 13:59:45 +02:00
Andreas Schroeder 11ca131607 detect Mac OSX and Windows, fall back to Linux 2014-04-30 00:58:57 +02:00
Andreas Schroeder 64cfab5b46 Mac OSX: fix includes & add missing functionality 2014-04-29 22:46:42 +02:00
Clayton Walker 4db97eae7c Set build independent binary output dir
Useful for using multimple compilers (gcc/clang) with different compile-time (debug/release)
2014-04-29 01:17:41 -06:00
Lioncash 8feabb00d6 Correct event handlers to trigger in all instnces
Some events don't propagate correctly to the right sub-window
and some things like the pad handler don't even necessarily have
windows. So, just register some events with the top-level app.

Also add a virtual destructor to the PadHandlerBase to be able to
deal with multiple inheritance in the derived classes.
2014-04-27 20:05:01 -04:00
Lioncash b877879db6 Clean up UI code.
- Use Bind instead of connect. It's recommended for anyone using wx 2.9+
- Remove AppConnector. All this did was destroy objects used in the UI. However, wxWidgets handles this. So it's redundant.
- Misc other unimportant changes.
2014-04-27 19:53:13 -04:00
Peter Tissen fad6c7cecb add asmjit path hack, we'll get rid of it sooner or later 2014-04-27 21:32:12 +02:00
Peter Tissen 95ca5315e7 fix path to the asmjit lib 2014-04-27 19:59:12 +02:00