aboutsummaryrefslogtreecommitdiff
path: root/smelt/glfw
diff options
context:
space:
mode:
Diffstat (limited to 'smelt/glfw')
-rw-r--r--smelt/glfw/makefile2
-rw-r--r--smelt/glfw/sys_glfw.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/smelt/glfw/makefile b/smelt/glfw/makefile
index e325ff3..d487454 100644
--- a/smelt/glfw/makefile
+++ b/smelt/glfw/makefile
@@ -1,5 +1,5 @@
CC= g++
-CXXFLAGS= -c -g -O2 -std=c++11 -Wall -I../include -D_LINUX -fPIC
+CXXFLAGS= -c -g -O2 -std=c++11 -Wall -I../../include -D_LINUX -fPIC
TARGET= libsmelt.a
all: objects-normal archive-normal
diff --git a/smelt/glfw/sys_glfw.cpp b/smelt/glfw/sys_glfw.cpp
index 6a35016..2c8b2e9 100644
--- a/smelt/glfw/sys_glfw.cpp
+++ b/smelt/glfw/sys_glfw.cpp
@@ -62,7 +62,7 @@ bool SMELT_IMPL::smInit()
int CPUInfo[4]={-1};
__cpuid(CPUInfo,0x80000000);
unsigned int nExIds=CPUInfo[0];
- char *cpuName,*loced;cpuName=calloc(0x40,sizeof(char));loced=cpuName;
+ char *cpuName,*loced;cpuName=(char*)calloc(0x40,sizeof(char));loced=cpuName;
for(unsigned int i=0x80000000;i<=nExIds;++i)
{
__cpuid(CPUInfo, i);
@@ -106,7 +106,8 @@ bool SMELT_IMPL::smInit()
return false;
}
GLFWmonitor *moninfo=glfwGetPrimaryMonitor();
- glfwGetMonitorPhysicalSize(moninfo,&dispw,&disph);
+ dispw=glfwGetVideoMode(moninfo)->width;
+ disph=glfwGetVideoMode(moninfo)->height;
smLog("%s:" SLINE ": Screen: %d x %d\n",SYS_GLFW_SRCFN,dispw,disph);
glfwWindowHint(GLFW_RED_BITS,8);
glfwWindowHint(GLFW_GREEN_BITS,8);