From 962b71d77331409e3452a033dae611bd2fb91149 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 24 Apr 2015 14:16:37 -0400 Subject: [PATCH] Added a stub menu creation function (for linking), turned off test program menu generation temporarily, and fixed another Windows build issue. --- new/test/main.c | 2 +- new/windows/GNUmakeinc.mk | 2 ++ new/windows/menu.c | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 new/windows/menu.c diff --git a/new/test/main.c b/new/test/main.c index 5fe612cd..62f40fb6 100644 --- a/new/test/main.c +++ b/new/test/main.c @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) return 1; } - initMenus(); +// initMenus(); w = newWindow("Main Window", 320, 240, 1); uiWindowOnClosing(w, onClosing, NULL); diff --git a/new/windows/GNUmakeinc.mk b/new/windows/GNUmakeinc.mk index 0b42fe0c..7ced11d0 100644 --- a/new/windows/GNUmakeinc.mk +++ b/new/windows/GNUmakeinc.mk @@ -6,6 +6,7 @@ osCFILES = \ windows/debug.c \ windows/init.c \ windows/main.c \ + windows/menu.c \ windows/oscontainer.c \ windows/text.c \ windows/util.c \ @@ -19,6 +20,7 @@ osCFLAGS = \ -D_UI_EXTERN='__declspec(dllexport) extern' osLDFLAGS = \ + -static-libgcc \ -luser32 -lkernel32 -lgdi32 -luxtheme -lmsimg32 -lcomdlg32 -lole32 -loleaut32 -loleacc -luuid osLIBSUFFIX = .dll diff --git a/new/windows/menu.c b/new/windows/menu.c new file mode 100644 index 00000000..bad737be --- /dev/null +++ b/new/windows/menu.c @@ -0,0 +1,8 @@ +// 24 april 2015 +#include "uipriv_windows.h" + +uiMenu *uiNewMenu(const char *name) +{ + // TODO + return NULL; +}