fixed some minor omcpile issues

5 files changed, 28 insertions, 8 deletions

diff --git a/menu_demo/button.c b/menu_demo/button.c
index f9d5ac0..82fe504 100644
--- a/menu_demo/button.c
+++ b/menu_demo/button.c
@@ -1,8 +1,15 @@
 #ifdef G_OS_WIN32

   #define WIN32_LEAN_AND_MEAN 1

-  #include <windows.h>

+  #include <windows.h>
+#else
+  #define FALSE 0
+  #define TRUE !FALSE
+  #define max(a, b)  (((a) > (b)) ? (a) : (b))
+

 #endif

 

+#include <string.h>

+

 #include <GL/gl.h>

 #include <string.h>

 #include <stdio.h>

@@ -364,4 +371,4 @@ void ButtonDisable(struct ButtonStruct *f_sButton)
 {

   f_sButton->m_bPressed = FALSE;

 

-} // ButtonDisable
\ No newline at end of file
+} // ButtonDisable
diff --git a/menu_demo/font.c b/menu_demo/font.c
index 9d52ada..e3773a5 100644
--- a/menu_demo/font.c
+++ b/menu_demo/font.c
@@ -1,9 +1,13 @@
 #ifdef G_OS_WIN32

   #define WIN32_LEAN_AND_MEAN 1

-  #include <windows.h>

+  #include <windows.h>
+#else
+  #define FALSE 0
+  #define TRUE !FALSE

 #endif

 

-#include <GL/gl.h>

+#include <GL/gl.h>
+#include <string.h>

 

 #include "font.h"

 #include "bitmap.h"

@@ -80,4 +84,4 @@ void glPrint(GLint x, GLint y, char *string, struct ColorStruct f_sColor)
 	  glMatrixMode(GL_MODELVIEW);

 	glPopMatrix();

 

-} // glPrint
\ No newline at end of file
+} // glPrint
diff --git a/menu_demo/font.h b/menu_demo/font.h
index 26c51dc..a7fa2a1 100644
--- a/menu_demo/font.h
+++ b/menu_demo/font.h
@@ -15,4 +15,4 @@ void FontInit(int f_iWinWidth, int f_iWinHeight);
 void FontDelete(GLvoid);

 void glPrint(GLint x, GLint y, char *string, struct ColorStruct f_sColor);

 

-#endif
\ No newline at end of file
+#endif
diff --git a/menu_demo/main.c b/menu_demo/main.c
index d802e4c..68180ef 100644
--- a/menu_demo/main.c
+++ b/menu_demo/main.c
@@ -4,6 +4,8 @@
 #endif

 

 #include <stdlib.h>

+#include <stdio.h>

+

 #include <GL/gl.h>

 #include <GL/glut.h>

 

@@ -100,6 +102,9 @@ int main(int argc, char **argv)
   init_gl();

   MenuInit(SCREEN_WIDTH, SCREEN_HEIGHT);

 

+  glutEstablishOverlay();

+  printf("Overlay %d\n", glutLayerGet(GLUT_OVERLAY_POSSIBLE));

+

   glutMainLoop();

 

   return 0;

diff --git a/menu_demo/menu.c b/menu_demo/menu.c
index b4d98cf..a36a916 100644
--- a/menu_demo/menu.c
+++ b/menu_demo/menu.c
@@ -1,11 +1,15 @@
 #ifdef G_OS_WIN32

   #define WIN32_LEAN_AND_MEAN 1

-  #include <windows.h>

+  #include <windows.h>
+#else
+  #define FALSE 0
+  #define TRUE !FALSE

 #endif

 

 #include <stdlib.h>

 #include <GL/gl.h>

-#include <GL/glut.h>

+#include <GL/glut.h>
+#include <string.h>

 

 #include "menu.h"

 #include "button.h"