| Previous | 199869 Revisions | Next |
| r36774 Sunday 29th March, 2015 at 17:10:34 UTC by Miodrag Milanović |
|---|
| more OSX 10.10 fixes and fixed mistake with x64 (nw) |
| [/trunk] | makefile |
| [scripts] | genie.lua |
| [scripts/src/osd] | sdl.lua sdl_cfg.lua windows.lua windows_cfg.lua |
| r245285 | r245286 | |
|---|---|---|
| 367 | 367 | |
| 368 | 368 | ifeq ($(TARGETOS),macosx) |
| 369 | 369 | ifneq (,$(findstring 3.,$(CLANG_VERSION))) |
| 370 | ifeq ($(ARCHITECTURE),x64) | |
| 370 | ifeq ($(ARCHITECTURE),_x64) | |
| 371 | 371 | ARCHITECTURE=_x64_clang |
| 372 | 372 | else |
| 373 | 373 | ARCHITECTURE=_x86_clang |
| r245285 | r245286 | |
|---|---|---|
| 702 | 702 | |
| 703 | 703 | configuration { "osx*" } |
| 704 | 704 | links { |
| 705 | "SDL2.framework", | |
| 705 | 706 | "Cocoa.framework", |
| 706 | 707 | "OpenGL.framework", |
| 707 | 708 | "CoreAudio.framework", |
| 708 | 709 | "CoreMIDI.framework", |
| 709 | "SDL2.framework", | |
| 710 | 710 | "pthread", |
| 711 | 711 | } |
| 712 | 712 | buildoptions { |
| 713 | 713 | "-F/Library/Frameworks/", |
| 714 | 714 | } |
| 715 | linkoptions { | |
| 716 | "-F/Library/Frameworks/", | |
| 717 | } | |
| 715 | 718 | |
| 716 | 719 | |
| 717 | 720 | configuration { "mingw*" } |
| 721 | defines { | |
| 722 | "main=utf8_main", | |
| 723 | } | |
| 718 | 724 | linkoptions { |
| 719 | 725 | "-static-libgcc", |
| 720 | 726 | "-static-libstdc++", |
| 727 | "-municode", | |
| 721 | 728 | } |
| 722 | 729 | if _OPTIONS["osd"]=="sdl" then |
| 723 | 730 | links { |
| r245285 | r245286 | |
| 745 | 752 | |
| 746 | 753 | configuration { "vs*" } |
| 747 | 754 | defines { |
| 755 | "main=utf8_main", | |
| 756 | } | |
| 757 | defines { | |
| 748 | 758 | "XML_STATIC", |
| 749 | 759 | "WIN32", |
| 750 | 760 | "_WIN32", |
| r245285 | r245286 | |
|---|---|---|
| 1 | 1 | function maintargetosdoptions(_target) |
| 2 | 2 | if _OPTIONS["targetos"]=="windows" then |
| 3 | 3 | linkoptions{ |
| 4 | "-municode", | |
| 5 | 4 | "-L$(shell qmake -query QT_INSTALL_LIBS)", |
| 6 | 5 | } |
| 7 | 6 | |
| r245285 | r245286 | |
| 29 | 28 | configuration { } |
| 30 | 29 | end |
| 31 | 30 | |
| 32 | ||
| 33 | 31 | configuration { "mingw*" } |
| 34 | 32 | linkoptions { |
| 35 | 33 | "-Wl,--allow-multiple-definition", |
| r245285 | r245286 | |
|---|---|---|
| 13 | 13 | "USE_OPENGL=1", |
| 14 | 14 | "USE_QTDEBUG=1", |
| 15 | 15 | "SDLMAME_NET_PCAP", |
| 16 | "main=utf8_main", | |
| 17 | 16 | } |
| 18 | 17 | |
| 19 | 18 | buildoptions { |
| r245285 | r245286 | |
|---|---|---|
| 1 | 1 | function maintargetosdoptions(_target) |
| 2 | linkoptions { | |
| 3 | "-municode", | |
| 4 | } | |
| 5 | ||
| 6 | 2 | local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc" |
| 7 | 3 | |
| 8 | 4 | if os.isfile(rcfile) then |
| r245285 | r245286 | |
|---|---|---|
| 12 | 12 | "USE_DISPATCH_GL=1", |
| 13 | 13 | "DIRECTINPUT_VERSION=0x0800", |
| 14 | 14 | "SDLMAME_NET_PCAP", |
| 15 | "main=utf8_main", | |
| 16 | 15 | } |
| https://github.com/mamedev/mame/commit/28165887618417add2d95be2e823391f98613569 |
| Previous | 199869 Revisions | Next |