claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,471 Commits 1 Branch 0 Tags
b75a81bdc2ee7b9c8f2cf4abfa6e742719b6aa9f
Commit Graph

68 Commits

Author SHA1 Message Date
David Hrdlička
7064e76896 Revert "Attempted fix for RtMidi." 
This reverts commit 9e00ac9c9f.
 2021-12-04 01:31:30 +01:00
OBattler
9e00ac9c9f Attempted fix for RtMidi. 2021-12-04 01:24:27 +01:00
OBattler
051b41ea6c Updated MacOS bundle version. 2021-12-04 01:21:11 +01:00
David Hrdlička
538b9bc478 Fix link order in MSYS2 build 2021-12-03 23:10:46 +01:00
David Hrdlička
4338560466 Properly find rtmidi on the CMake build 2021-12-03 21:51:31 +01:00
OBattler
3eaa6153b5 Switched MIDI to RtMidi. 2021-12-03 20:12:44 +01:00
dob205
5357cea1bc Showing the build number in the user viewable bundle version 2021-11-19 17:42:48 +01:00
dob205
6f9d4e5bb3 slight fixes for that file 
Makes the macOS bundle display the proper copyright and version numbers
 2021-11-19 17:40:28 +01:00
dob205
5f303ba4c7 Cleaning up some things k 2021-11-19 17:38:42 +01:00
Miran Grča
5ee200eabd Merge pull request #1847 from jvernet/master 
MacOsX Compilation fixed
 2021-11-19 17:14:07 +01:00
jvernet
77b1f8a71e MacOsX Compilation 2021-11-19 16:57:38 +01:00
jvernet
46af2a7a8f MacOSX Default ROM PATH 2021-11-19 16:42:43 +01:00
Cacodemon345
e50afd9b6b Fix macOS linking 2021-11-19 20:42:03 +06:00
dob205
469a9d0b7a Adds the macOSXglue.m into the compilation process 
Enables to get the macOSXglue up and running while compiling 86Box on macOS, also executes some functions related to macOS now not on Windows and Linux anymore
 2021-11-19 13:44:53 +01:00
jvernet
13371d03bd macOSX Rom path detecttion 2021-11-19 12:41:31 +01:00
jvernet
63099ea3ff Update CMakeLists.txt 2021-11-17 20:30:50 +01:00
RichardG867
0de137daf7 Merge branch 'master' of https://github.com/86Box/86Box into cleanup30 
# Conflicts:
#	src/include/86box/machine.h
#	src/machine/m_at_socket7.c
#	src/machine/machine_table.c
#	src/video/vid_tgui9440.c
#	src/win/win.c
 2021-11-14 13:45:37 -03:00
OBattler
3730117a37 Conflict resolution. 2021-11-13 22:49:19 +01:00
RichardG867
bfe19db5b4 Shuffle around and improve build number injection 2021-11-12 21:53:12 -03:00
dob205
23b01383e0 Fixing compiling with normal user permissions 
This should enable compiling things on macOS without resorting to use sudo before cmake --build build --target install.
 2021-11-10 11:13:10 +01:00
dob205
99097d5555 Adjusting the install command 
This change should hopefully make the GitHub Actions instance happy for CMake.
 2021-11-10 10:40:51 +01:00
dob205
9f78c37f37 Tweaking things to fix potential compile errors 
Should hopefully make GitHub Actions happy
 2021-11-10 10:26:00 +01:00
dob205
4728483188 Updating the CMakeLists.txt to create macOS app bundles 
Changes the CMakeLists.txt to enable the creation of macOS app bundles via cmake --build build --target install including all necessary dylibs for a functioning macOS compile.
 2021-11-10 10:01:37 +01:00
OBattler
312ce110af Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-10-19 18:21:36 +02:00
Andreas J. Reichel
6dd744141c Make it build in arch linux and Debian 
* Probably unresolved external due to newer gcc, thus
  added libsdl to libui.a as well.
* Make it work for all distros, which either have SDL2::SDL2
  or ${SDL2_LIBRARIES}, provided by sdl2-config or FindSDL2.cmake.

Signed-off-by: Andreas J. Reichel <homebase_ar@web.de>
 2021-10-18 21:15:31 +02:00
OBattler
b9c2e35ba2 Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-10-07 14:37:06 +02:00
dob205
ce5a1ed054 Fixes for library search on macOS 
Fixes the screenshot function on macOS if the user installed libpng via homebrew. Previously it would link to older libraries if those were installed, while at runtime it decided to run the version installed by homebrew.
 2021-10-07 10:00:11 +02:00
OBattler
b5f7e9bec3 Conflict resolution. 2021-09-25 14:24:29 +02:00
David Hrdlička
73cac00119 Remove pthreads on Win32 from build files 2021-09-23 23:03:33 +02:00
OBattler
d924589d88 Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-09-21 12:15:43 +02:00
Cacodemon345
29b0946c7e Link ws2_32 only on Windows 2021-09-20 16:00:03 +06:00
OBattler
e42fdbfcdd Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-09-18 15:25:37 +02:00
Cacodemon345
80b85cd384 Fix linking with pthreads on Windows 2021-09-18 13:16:39 +06:00
OBattler
6d6e5f9e67 Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-09-17 23:32:05 +02:00
Cacodemon345
68a9e4094f Fix build on Ubuntu 20.04 LTS 2021-09-17 22:26:54 +02:00
OBattler
2bc9e7520a Conflict resolution. 2021-09-17 02:48:18 +02:00
David Hrdlička
0e2cf677fb cmake: fix pthread linking, take 2 2021-09-15 13:05:00 +02:00
David Hrdlička
719d155393 cmake: fix pthread linking on Windows 2021-09-15 12:50:33 +02:00
OBattler
206c34ed27 CMakeList.txt now uses libpthread. 2021-09-15 00:01:18 +02:00
OBattler
b0367133d6 And back. 2021-09-14 22:36:21 +02:00
OBattler
dbdf07aa96 Two files to resolve conflicts. 2021-09-14 22:33:39 +02:00
OBattler
3c2ac29c68 Switched threads to pthread for all platforms (on Windows, you can compile with Win32 threads using PTHREAD=n). 2021-09-14 21:58:15 +02:00
Miran Grča
b0ec4e1ece Merge pull request #1652 from 86Box/master 
Brought the branch up to par with master.
 2021-09-03 16:41:24 +02:00
David Hrdlička
6c26a99841 cmake: full static linking on mingw builds 2021-09-02 15:34:06 +02:00
Miran Grča
a505a6a910 Merge pull request #1640 from 86Box/master 
Brought the branch up to par with master.
 2021-09-01 15:03:15 +02:00
Cacodemon345
7fe4c63cb3 Enable static linking only on Windows 2021-08-30 00:00:37 +06:00
Cacodemon345
ea641cc0ae Look for OpenAL in the proper way 2021-08-29 23:50:21 +06:00
Cacodemon345
7856884a2b CMake OpenAL include directory variable is without a S 2021-08-29 23:50:21 +06:00
Cacodemon345
f6af2b0162 Fix compile errors and get rid of glib dependency 2021-08-29 23:50:21 +06:00
Cacodemon345
1b93e8e989 Initial Linux/Unix code 2021-08-29 23:50:16 +06:00