remove surplus cmake file and fix sdl problem

H-uru · Nov 12, 2018 · 3850721 · 3850721
1 parent 45d9158
commit 3850721
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 76 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@
 
 cmake_minimum_required(VERSION 3.0)
 project(imaginaryMyst LANGUAGES CXX)
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/src/cmake/Modules)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 include(FeatureSummary)
 message(${CMAKE_MODULE_PATH})
 

diff --git a/src/Main.cpp b/src/Main.cpp
@@ -122,7 +122,7 @@ ST::string s_rootPath;
 
 imVfs s_vfs;
 SDL_Window *s_display;
-SDL_GLContext s_glContext
+SDL_GLContext s_glContext;
 FILE *s_logFile = stderr;
 
 PFNGLCOMPRESSEDTEXIMAGE2DARBPROC GLX_CompressedTexImage2D = 0;
@@ -249,21 +249,13 @@ int main(int argc, char *argv[])
 
 
     // Create a window for the game
-<<<<<<< HEAD
-    s_display = SDL_CreateWindow("imaginaryMyst Alpha", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, winWidth,
-                                 winHeight, SDL_WINDOW_OPENGL);
 
-
-    SDL_GLContext glContext = SDL_GL_CreateContext(s_display);
-=======
     s_display = SDL_CreateWindow("imaginaryMyst Alpha",
                                  SDL_WINDOWPOS_CENTERED,
                                  SDL_WINDOWPOS_CENTERED,
                                  winWidth, winHeight,
                                  SDL_WINDOW_OPENGL);
     s_glContext = SDL_GL_CreateContext(s_display);
-
->>>>>>> CHeck for opengl version, minimum require 3, and only enable debugging when supported
     glewExperimental = true;
     if (glewInit() != GLEW_OK) {
         fprintf(stderr, "Failed to initialize GLEW\n");
@@ -336,6 +328,6 @@ int main(int argc, char *argv[])
 
     SDL_GL_SwapWindow(s_display);
     SDL_Delay(3000);
-cleanup();
+    cleanup();
     return 0;
 }
diff --git a/src/cmake/Modules/FindGLM.cmake b/src/cmake/Modules/FindGLM.cmake
diff --git a/src/graphics/imPipeline.h b/src/graphics/imPipeline.h
@@ -2,7 +2,6 @@
 #define IMAGINARYMYST_IMPIPELINE_H
 
 
-#include <imString.h>
 #include <GL/gl.h>
 #include <vector>
 #include <glm/glm.hpp>