X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_menu.c;h=33d82a2dbda0415e57cc782e96ed99c355b48676;hb=c4ffff1de4b14af7f0efb231f476961c21f3f552;hp=1f9a831918738747a0816606542d2a6cd2c44178;hpb=36c6530f942007c5a72c6a3bd6d00077027d8c06;p=freeglut diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c index 1f9a831..33d82a2 100644 --- a/src/freeglut_menu.c +++ b/src/freeglut_menu.c @@ -29,7 +29,7 @@ #include "config.h" #endif -#include "../include/GL/freeglut.h" +#include #include "freeglut_internal.h" /* -- DEFINITIONS ---------------------------------------------------------- */ @@ -56,7 +56,7 @@ * that that wasn't the original intent...if not, perhaps we need another * symbolic constant, FREEGLUT_MENU_ITEM_BORDER, or such.) */ -#if TARGET_HOST_WIN32 +#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE #define FREEGLUT_MENU_FONT GLUT_BITMAP_8_BY_13 #else #define FREEGLUT_MENU_FONT GLUT_BITMAP_HELVETICA_18 @@ -75,7 +75,7 @@ * too. These variables should be stuffed into global state and initialized * via the glutInit*() system. */ -#if TARGET_HOST_WIN32 +#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE static float menu_pen_fore [4] = {0.0f, 0.0f, 0.0f, 1.0f}; static float menu_pen_back [4] = {0.85f, 0.85f, 0.85f, 1.0f}; static float menu_pen_hfore [4] = {1.0f, 1.0f, 1.0f, 1.0f};