| Previous | 199869 Revisions | Next |
| r36064 Sunday 22nd February, 2015 at 19:34:12 UTC by Couriersud |
|---|
| Merge branch 'master' of https://github.com/mamedev/mame.git |
| [/branches/kale/src/osd/sdl] | sdl.mak |
| [/branches/kale/src/osd/windows] | window.c |
| r244575 | r244576 | |
|---|---|---|
| 734 | 734 | LIBS += -lSDL2 -limm32 -lversion -lole32 -loleaut32 -lws2_32 -static |
| 735 | 735 | BASELIBS += -lSDL2 -limm32 -lversion -lole32 -loleaut32 -lws2_32 -static |
| 736 | 736 | else |
| 737 | LIBS += -lSDL -static | |
| 738 | BASELIBS += -lSDL -static | |
| 737 | LIBS += -lSDL -lws2_32 -static | |
| 738 | BASELIBS += -lSDL -lws2_32 -static | |
| 739 | 739 | endif |
| 740 | 740 | LIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi |
| 741 | 741 | BASELIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi |
| r244575 | r244576 | |
|---|---|---|
| 1405 | 1405 | |
| 1406 | 1406 | // destroy: clean up all attached rendering bits and NULL out our hwnd |
| 1407 | 1407 | case WM_DESTROY: |
| 1408 | window->m_renderer->destroy(); | |
| 1409 | global_free(window->m_renderer); | |
| 1410 | window->m_renderer = NULL; | |
| 1408 | if (!(window->m_renderer == NULL)) | |
| 1409 | { | |
| 1410 | window->m_renderer->destroy(); | |
| 1411 | global_free(window->m_renderer); | |
| 1412 | window->m_renderer = NULL; | |
| 1413 | } | |
| 1411 | 1414 | window->m_hwnd = NULL; |
| 1412 | 1415 | return DefWindowProc(wnd, message, wparam, lparam); |
| 1413 | 1416 |
| https://github.com/mamedev/mame/commit/c2c3a819a59998b351a76415b2c5a7853a07da85 |
| Previous | 199869 Revisions | Next |