aboutsummaryrefslogtreecommitdiff
path: root/smelt/sdl
diff options
context:
space:
mode:
Diffstat (limited to 'smelt/sdl')
-rw-r--r--smelt/sdl/makefile2
-rw-r--r--smelt/sdl/sys_sdl.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/smelt/sdl/makefile b/smelt/sdl/makefile
index d58f077..f118481 100644
--- a/smelt/sdl/makefile
+++ b/smelt/sdl/makefile
@@ -1,5 +1,5 @@
CC= g++
-CXXFLAGS= -c -g -O2 -std=c++11 -Wall -I/usr/include/SDL/ -I../include -D_LINUX -fPIC
+CXXFLAGS= -c -g -O2 -std=c++11 -Wall -I/usr/include/SDL/ -I../../include -D_LINUX -fPIC
TARGET= libsmelt.a
all: objects-normal archive-normal
diff --git a/smelt/sdl/sys_sdl.cpp b/smelt/sdl/sys_sdl.cpp
index beb07a0..c0f64d0 100644
--- a/smelt/sdl/sys_sdl.cpp
+++ b/smelt/sdl/sys_sdl.cpp
@@ -51,7 +51,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);