Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow compiling for 32bit Windows & move custom glsym.h code to main.cpp #40

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −40
Open

Allow compiling for 32bit Windows & move custom glsym.h code to main.cpp #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ include:
# Windows 64-bit
- project: 'libretro-infrastructure/ci-templates'
file: '/windows-x64-mingw.yml'

# Windows 32-bit
- project: 'libretro-infrastructure/ci-templates'
file: '/windows-i686-mingw.yml'

# Linux 64-bit
- project: 'libretro-infrastructure/ci-templates'
Expand Down Expand Up @@ -50,6 +54,12 @@ libretro-build-windows-x64:
extends:
- .libretro-windows-x64-mingw-make-default
- .core-defs

# Windows 32-bit
libretro-build-windows-i686:
extends:
- .libretro-windows-i686-mingw-make-default
- .core-defs

# Linux 64-bit
libretro-build-linux-x64:
Expand Down
38 changes: 0 additions & 38 deletions src/platform/libretro/glsym.h
View file
Open in desktop

This file was deleted.

16 changes: 14 additions & 2 deletions src/platform/libretro/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,23 @@
#include <string.h>
#include <math.h>

#ifdef _WIN32
#include "glsym.h" // Use local modified glsym.h to allow compilation on 64bit Windows
#ifdef _WIN32 // Fixes compiling on Windows
#ifndef __LIBRETRO_SDK_GLSYM_H__
#define __LIBRETRO_SDK_GLSYM_H__
#include <glsym/rglgen.h>
#ifndef HAVE_PSGL
#if defined(HAVE_OPENGLES2)
#include <glsym/glsym_es2.h>
#else
#ifdef HAVE_OPENGLES3
#include <glsym/glsym_es3.h>
#endif
#endif
#endif
#else
#include <glsym/glsym.h>
#endif
#endif

#include <libretro.h>
#include <file/file_path.h>
Expand Down