diff --git a/Makefile.common b/Makefile.common
index ba25f71fea..0d7cd240ba 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -532,16 +532,15 @@ ifeq ($(HAVE_OPENGL), 1)
    else
       DEFINES += -DHAVE_GL_SYNC
       OBJ += libretro-common/glsym/glsym_gl.o
+		GL_LIBS := -lGL
       ifeq ($(OSX), 1)
-         LIBS += -framework OpenGL
+         GL_LIBS := -framework OpenGL
          OBJ += gfx/drivers_context/cgl_ctx.o
       else ifneq ($(findstring Win32,$(OS)),)
-         LIBS += -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32
-         OBJ += gfx/drivers_context/wgl_ctx.o \
-		gfx/drivers_wm/win32_shader_dlg.o
-      else
-         LIBS += -lGL
+         GL_LIBS := -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32
+         OBJ += gfx/drivers_context/wgl_ctx.o gfx/drivers_wm/win32_shader_dlg.o
       endif
+		LIBS += $(GL_LIBS)
    endif
 
    OBJ += gfx/drivers_shader/shader_glsl.o