From 3b709df866868062448b769e5e8b5eaa1a0ab3d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Pe=C3=B1aranda?= Date: Tue, 5 Mar 2013 15:32:45 -0300 Subject: [PATCH] compiles (but doesn't work) on windows with msvc --- openglcanvas.cpp | 8 ++++++-- openglcanvas.h | 4 ++-- pano_interface_1.pro | 12 +++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/openglcanvas.cpp b/openglcanvas.cpp index 2b91e21..7dceb9f 100644 --- a/openglcanvas.cpp +++ b/openglcanvas.cpp @@ -14,9 +14,13 @@ #ifdef _WIN32 #include #define GET_WORKDIR _getcwd + #define OPEN_FILE _open + #define LSEEK_FD _lseek #else // unistd was included above #define GET_WORKDIR getcwd + #define OPEN_FILE open + #define LSEEK_FD lseek #endif #define PROGNAME "pano_interface" @@ -614,8 +618,8 @@ char * OpenGLCanvas::textFileRead(char *fn) { FILE *fp; char *content = NULL; int f, count; - f = open(fn, O_RDONLY); - count = lseek(f, 0, SEEK_END); + f = OPEN_FILE(fn, O_RDONLY); + count = LSEEK_FD(f, 0, SEEK_END); // close(f); if (fn != NULL) { fp = fopen(fn,"rt"); diff --git a/openglcanvas.h b/openglcanvas.h index fa8c3fc..2ee2083 100644 --- a/openglcanvas.h +++ b/openglcanvas.h @@ -16,8 +16,8 @@ #include #include #else - #include - #include + //#include + //#include #include // is glext really needed? //#include diff --git a/pano_interface_1.pro b/pano_interface_1.pro index 03008ca..3d7ff66 100644 --- a/pano_interface_1.pro +++ b/pano_interface_1.pro @@ -23,9 +23,15 @@ LIBS += -lm -lglut -lGL -lGLEW -lnetpbm win32 { DEFINES += GLEW_STATIC -INCLUDEPATH += "C:/Program Files (x86)/GnuWin32/include/" -LIBS += -L"C:/Program Files (x86)/GnuWin32/lib/" -LIBS += -lfreeglut -llibnetpbm10 -lglu32 -lopengl32 -lglew32 +DEFINES += _CRT_SECURE_NO_WARNINGS +INCLUDEPATH += "C:/Program Files (x86)/glew-1.5.2/include" +DEPENDPATH += "C:/Program Files (x86)/glew-1.5.2/include" +INCLUDEPATH += "C:/Program Files (x86)/GnuWin32/include" +DEPENDPATH += "C:/Program Files (x86)/GnuWin32/include" +LIBS += -L"C:/Program Files (x86)/GnuWin32/lib" +LIBS += -lglu32 -lopengl32 -lfreeglut -llibnetpbm10 +LIBS += -L"C:/Program Files (x86)/glew-1.5.2/lib" +LIBS += -lglew32s } TARGET = pano_interface_1 -- GitLab