diff --git a/.gitignore b/.gitignore index 1dcb012..5097efe 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ Makefile *.o *.a *.dll +*.lib +*.res diff --git a/icon/icon.ico b/icon/icon.ico new file mode 100644 index 0000000..3867892 Binary files /dev/null and b/icon/icon.ico differ diff --git a/pmake.js b/pmake.js index cd68f5c..54aeae5 100644 --- a/pmake.js +++ b/pmake.js @@ -8,6 +8,10 @@ function main() { IDE.libdirs = [ main.milsko + "/src", main.milsko + "/lib" ]; IDE.libraries = [ "stb", "ppr", "Mw" ]; + if(pmake.system.target == "Windows"){ + IDE.sources.push("src/midas.rc"); + } + pmake.register(IDE); } main.milsko = "/usr/local"; diff --git a/src/gui.c b/src/gui.c index 53e325a..fa2f276 100644 --- a/src/gui.c +++ b/src/gui.c @@ -71,11 +71,11 @@ static void MWAPI resize(MwWidget handle, void* user, void* client) { } } -static void window_close(MwWidget handle, void* user, void* client) { +static void MWAPI window_close(MwWidget handle, void* user, void* client) { MwDestroyWidget(loop); } -static void tick(MwWidget handle, void* user, void* client) { +static void MWAPI tick(MwWidget handle, void* user, void* client) { dir_tick(); } diff --git a/src/gui_menu.c b/src/gui_menu.c index a4909e7..758e9ce 100644 --- a/src/gui_menu.c +++ b/src/gui_menu.c @@ -2,7 +2,7 @@ static MwMenu m_exit, m_preferences, m_about_midas; -static void menu_handler(MwWidget handle, void* user, void* client) { +static void MWAPI menu_handler(MwWidget handle, void* user, void* client) { if(client == m_exit) { MwDispatchUserHandler(window, MwNcloseHandler, NULL); } else if(client == m_preferences) { diff --git a/src/gui_preferences.c b/src/gui_preferences.c index 5872023..4e1aafb 100644 --- a/src/gui_preferences.c +++ b/src/gui_preferences.c @@ -1,6 +1,6 @@ #include -static void pref_close(MwWidget handle, void* user, void* client) { +static void MWAPI pref_close(MwWidget handle, void* user, void* client) { MwDestroyWidget(user); } diff --git a/src/gui_version.c b/src/gui_version.c index 8b155b4..de5af47 100644 --- a/src/gui_version.c +++ b/src/gui_version.c @@ -30,7 +30,7 @@ static void image_draw_inject(MwWidget handle) { MwLLFreeColor(c); } -static void version_close(MwWidget handle, void* user, void* client) { +static void MWAPI version_close(MwWidget handle, void* user, void* client) { int i; MwWidget* children = MwGetChildren(user); diff --git a/src/midas.rc b/src/midas.rc new file mode 100644 index 0000000..b85eb8d --- /dev/null +++ b/src/midas.rc @@ -0,0 +1,3 @@ +#include + +WINVER ICON "../icon/icon.ico"