Added a stub menu creation function (for linking), turned off test program menu generation temporarily, and fixed another Windows build issue.
This commit is contained in:
parent
c97f95ef10
commit
962b71d773
|
@ -37,7 +37,7 @@ int main(int argc, char *argv[])
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
initMenus();
|
// initMenus();
|
||||||
|
|
||||||
w = newWindow("Main Window", 320, 240, 1);
|
w = newWindow("Main Window", 320, 240, 1);
|
||||||
uiWindowOnClosing(w, onClosing, NULL);
|
uiWindowOnClosing(w, onClosing, NULL);
|
||||||
|
|
|
@ -6,6 +6,7 @@ osCFILES = \
|
||||||
windows/debug.c \
|
windows/debug.c \
|
||||||
windows/init.c \
|
windows/init.c \
|
||||||
windows/main.c \
|
windows/main.c \
|
||||||
|
windows/menu.c \
|
||||||
windows/oscontainer.c \
|
windows/oscontainer.c \
|
||||||
windows/text.c \
|
windows/text.c \
|
||||||
windows/util.c \
|
windows/util.c \
|
||||||
|
@ -19,6 +20,7 @@ osCFLAGS = \
|
||||||
-D_UI_EXTERN='__declspec(dllexport) extern'
|
-D_UI_EXTERN='__declspec(dllexport) extern'
|
||||||
|
|
||||||
osLDFLAGS = \
|
osLDFLAGS = \
|
||||||
|
-static-libgcc \
|
||||||
-luser32 -lkernel32 -lgdi32 -luxtheme -lmsimg32 -lcomdlg32 -lole32 -loleaut32 -loleacc -luuid
|
-luser32 -lkernel32 -lgdi32 -luxtheme -lmsimg32 -lcomdlg32 -lole32 -loleaut32 -loleacc -luuid
|
||||||
|
|
||||||
osLIBSUFFIX = .dll
|
osLIBSUFFIX = .dll
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
// 24 april 2015
|
||||||
|
#include "uipriv_windows.h"
|
||||||
|
|
||||||
|
uiMenu *uiNewMenu(const char *name)
|
||||||
|
{
|
||||||
|
// TODO
|
||||||
|
return NULL;
|
||||||
|
}
|
Loading…
Reference in New Issue