diff options
author | Chris Xiong <chirs241097@gmail.com> | 2016-05-05 23:48:06 +0800 |
---|---|---|
committer | Chris Xiong <chirs241097@gmail.com> | 2016-05-05 23:48:06 +0800 |
commit | bda9ef9345786d48fd0d98b0855ce965e1028b2f (patch) | |
tree | cdcc7adc9f496c37cbcc75d8cccd2066d02c277b /smelt/sdl/sys_sdl.cpp | |
parent | c2b99f6321965b2c5b30a1b72b29119281c2d7e1 (diff) | |
download | SMELT-bda9ef9345786d48fd0d98b0855ce965e1028b2f.tar.xz |
Add support for batching vertices with custom indices.
Fix compiler warnings.
Diffstat (limited to 'smelt/sdl/sys_sdl.cpp')
-rw-r--r-- | smelt/sdl/sys_sdl.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/smelt/sdl/sys_sdl.cpp b/smelt/sdl/sys_sdl.cpp index 427b1bf..b33d71b 100644 --- a/smelt/sdl/sys_sdl.cpp +++ b/smelt/sdl/sys_sdl.cpp @@ -53,7 +53,7 @@ bool SMELT_IMPL::smInit() unsigned int nExIds=CPUInfo[0]; char *cpuName,*loced;cpuName=calloc(0x40,sizeof(char));loced=cpuName; for(unsigned int i=0x80000000;i<=nExIds;++i) - { + { __cpuid(CPUInfo, i); if(i==0x80000002) memcpy(cpuName,CPUInfo,sizeof(CPUInfo)); @@ -69,17 +69,17 @@ bool SMELT_IMPL::smInit() GlobalMemoryStatus(&mem_st); smLog("%s:" SLINE ": Memory: %ldK total, %ldK free\n", SYS_SDL_SRCFN,mem_st.dwTotalPhys/1024L,mem_st.dwAvailPhys/1024L); #else - system("uname -svm > os.out"); - char osv[100];FILE* a=fopen("os.out","r");fgets(osv,100,a);fclose(a); + system("uname -svm > /tmp/os.out"); + char osv[100];FILE* a=fopen("/tmp/os.out","r");fgets(osv,100,a);fclose(a); osv[strlen(osv)-1]='\0'; smLog("%s:" SLINE ": OS: %s\n",SYS_SDL_SRCFN,osv); - system("rm os.out"); + system("rm /tmp/os.out"); - system("cat /proc/cpuinfo | grep name -m 1 > cpu.out"); - a=fopen("cpu.out","r");fgets(osv,100,a);fclose(a); + system("cat /proc/cpuinfo | grep name -m 1 > /tmp/cpu.out"); + a=fopen("/tmp/cpu.out","r");fgets(osv,100,a);fclose(a); osv[strlen(osv)-1]='\0';char *ptr=osv;while(*ptr!=':')++ptr;ptr+=2; smLog("%s:" SLINE ": CPU: %s\n",SYS_SDL_SRCFN,osv); - system("rm cpu.out"); + system("rm /tmp/cpu.out"); a=fopen("/proc/meminfo","r"); unsigned totalm,freem; |