mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-08 23:10:42 +02:00
Code Issues Projects Releases Wiki Activity

- load of changes to get things compiling under VC++ 2010 (with updated deps seperate for vc2010)

Browse Source
This commit is contained in:
Mark Vejvoda
2012-04-20 01:04:05 +00:00
parent 329bb58b04
commit dbb116f250
122 changed files with 938 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/g3d_viewer/main.cpp
View File

@@ -528,19 +528,26 @@ void MainWindow::setupStartupSettings() {
}
MainWindow::~MainWindow(){
delete renderer;
renderer = NULL;
delete model;
model = NULL;
delete timer;
timer = NULL;
delete glCanvas;
delete model;
model = NULL;
delete renderer;
renderer = NULL;
//delete glCanvas;
if(glCanvas) glCanvas->Destroy();
glCanvas = NULL;
}
void MainWindow::init() {
#if wxCHECK_VERSION(2, 9, 1)
#if wxCHECK_VERSION(2, 9, 3)
glCanvas->setCurrentGLContext();
#elif wxCHECK_VERSION(2, 9, 1)
#else
glCanvas->SetCurrent();
@@ -700,7 +707,21 @@ void MainWindow::onClose(wxCloseEvent &event){
//printf("OnClose about to END\n");
//fflush(stdout);
delete this;
delete timer;
timer = NULL;
delete model;
model = NULL;
delete renderer;
renderer = NULL;
//delete glCanvas;
if(glCanvas) glCanvas->Destroy();
glCanvas = NULL;
//delete this;
this->Destroy();
}
// for the mousewheel

6
source/g3d_viewer/main.h
View File

@@ -12,8 +12,12 @@
#ifndef _SHADER_G3DVIEWER_MAIN_H_
#define _SHADER_G3DVIEWER_MAIN_H_
#include <string>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <GL/glew.h>
#include <wx/wx.h>
#include <wx/glcanvas.h>

10
source/g3d_viewer/renderer.h
View File

@@ -12,12 +12,10 @@
#ifndef _SHADER_G3DVIEWER_RENDERER_H_
#define _SHADER_G3DVIEWER_RENDERER_H_
/*
#include "model_renderer.h"
#include "texture_manager.h"
#include "model.h"
#include "texture.h"
*/
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "model_renderer.h"
#include "texture_manager.h"