| Previous | 199869 Revisions | Next |
| r36781 Sunday 29th March, 2015 at 20:50:55 UTC by Couriersud |
|---|
| Fix compile. (nw) |
| [scripts] | genie.lua |
| [scripts/src/osd] | sdl.lua sdl_cfg.lua windows.lua windows_cfg.lua |
| r245292 | r245293 | |
|---|---|---|
| 726 | 726 | |
| 727 | 727 | configuration { "osx*" } |
| 728 | 728 | links { |
| 729 | "SDL2.framework", | |
| 729 | 730 | "Cocoa.framework", |
| 730 | 731 | "OpenGL.framework", |
| 731 | 732 | "CoreAudio.framework", |
| 732 | 733 | "CoreMIDI.framework", |
| 733 | "SDL2.framework", | |
| 734 | 734 | "pthread", |
| 735 | 735 | } |
| 736 | buildoptions { | |
| 737 | "-F/Library/Frameworks/", | |
| 738 | } | |
| 739 | linkoptions { | |
| 740 | "-F/Library/Frameworks/", | |
| 741 | } | |
| 736 | 742 | |
| 737 | 743 | |
| 738 | 744 | configuration { "mingw*" } |
| 739 | defines { | |
| 740 | "main=utf8_main", | |
| 741 | } | |
| 742 | 745 | linkoptions { |
| 743 | 746 | "-static-libgcc", |
| 744 | 747 | "-static-libstdc++", |
| 745 | "-municode", | |
| 746 | 748 | } |
| 747 | 749 | if _OPTIONS["osd"]=="sdl" then |
| 748 | 750 | links { |
| r245292 | r245293 | |
| 770 | 772 | |
| 771 | 773 | configuration { "vs*" } |
| 772 | 774 | defines { |
| 773 | "main=utf8_main", | |
| 774 | } | |
| 775 | defines { | |
| 776 | 775 | "XML_STATIC", |
| 777 | 776 | "WIN32", |
| 778 | 777 | "_WIN32", |
| r245292 | r245293 | |
|---|---|---|
| 1 | 1 | function maintargetosdoptions(_target) |
| 2 | if (USE_QT == 1) then | |
| 3 | if _OPTIONS["targetos"]=="windows" then | |
| 2 | if _OPTIONS["targetos"]=="windows" then | |
| 3 | linkoptions{ | |
| 4 | "-municode", | |
| 5 | } | |
| 6 | if (USE_QT == 1) then | |
| 4 | 7 | linkoptions{ |
| 5 | 8 | "-L$(shell qmake -query QT_INSTALL_LIBS)", |
| 6 | 9 | } |
| 7 | ||
| 8 | 10 | links { |
| 9 | 11 | "qtmain", |
| 10 | 12 | "QtGui4", |
| 11 | 13 | "QtCore4", |
| 12 | 14 | } |
| 13 | 15 | end |
| 14 | ||
| 15 | if _OPTIONS["targetos"]=="linux" then | |
| 16 | end | |
| 17 | if _OPTIONS["targetos"]=="linux" then | |
| 18 | if (USE_QT == 1) then | |
| 16 | 19 | links { |
| 17 | 'QtGui', | |
| 18 | 'QtCore', | |
| 20 | "QtGui", | |
| 21 | "QtCore", | |
| 19 | 22 | } |
| 20 | 23 | |
| 21 | 24 | linkoptions { |
| 22 | | |
| 25 | "$(shell pkg-config --libs QtGui)", | |
| 23 | 26 | } |
| 24 | 27 | end |
| 25 | 28 | end |
| r245292 | r245293 | |
| 30 | 33 | configuration { } |
| 31 | 34 | end |
| 32 | 35 | |
| 36 | ||
| 33 | 37 | configuration { "mingw*" } |
| 34 | 38 | linkoptions { |
| 35 | 39 | "-Wl,--allow-multiple-definition", |
| r245292 | r245293 | |
|---|---|---|
| 13 | 13 | "USE_OPENGL=1", |
| 14 | 14 | "USE_QTDEBUG=" .. USE_QT, |
| 15 | 15 | "SDLMAME_NET_PCAP", |
| 16 | "main=utf8_main", | |
| 16 | 17 | } |
| 17 | 18 | |
| 18 | 19 | buildoptions { |
| r245292 | r245293 | |
|---|---|---|
| 1 | 1 | function maintargetosdoptions(_target) |
| 2 | linkoptions { | |
| 3 | "-municode", | |
| 4 | } | |
| 5 | ||
| 2 | 6 | local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc" |
| 3 | 7 | |
| 4 | 8 | if os.isfile(rcfile) then |
| r245292 | r245293 | |
|---|---|---|
| 12 | 12 | "USE_DISPATCH_GL=1", |
| 13 | 13 | "DIRECTINPUT_VERSION=0x0800", |
| 14 | 14 | "SDLMAME_NET_PCAP", |
| 15 | "main=utf8_main", | |
| 15 | 16 | } |
| https://github.com/mamedev/mame/commit/a67f2cb095432d30142381be9ccd3c57ba3d78fb |
| Previous | 199869 Revisions | Next |