Fixed a couple of issues relating to travis-ci compiling

Yabause · Sep 22, 2017 · c69a939 · c69a939
1 parent 722f198
commit c69a939
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -71,7 +71,7 @@ matrix:
             - gcc-mingw-w64-x86-64
             - g++-mingw-w64-x86-64
             - binutils-mingw-w64-x86-64
-            - mingw-w64-dev
+            - mingw-w64-x86-64-dev
       script:
         # create toolchain file so we can cross compile
         - echo 'SET(CMAKE_SYSTEM_NAME Windows)' > toolchain.cmake

diff --git a/yabause/src/ygles.c b/yabause/src/ygles.c
@@ -696,7 +696,8 @@ int YglGLInit(int width, int height) {
    }
    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 
-   if( _Ygl->vdp1FrameBuff != 0 ) glDeleteTextures(2,_Ygl->vdp1FrameBuff);
+   if( _Ygl->vdp1FrameBuff != NULL ) // Why is this check even here? It will always be non-zero
+      glDeleteTextures(2,_Ygl->vdp1FrameBuff);
    glGenTextures(2,_Ygl->vdp1FrameBuff);
    glBindTexture(GL_TEXTURE_2D,_Ygl->vdp1FrameBuff[0]);
    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, GlWidth, GlHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE,NULL);