diff options
| author | Bernard Xiong <[email protected]> | 2013-02-26 17:44:33 -0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2013-02-26 17:44:33 -0800 |
| commit | 76bdeb3ec3b0ffee21c85b1a50d023a0da50041e (patch) | |
| tree | 53fb128a24234b554ef3a3766531b87deaf922b4 /libcpu | |
| parent | caf18dabdfa4e500d570ed4cb2d14d332eb880ab (diff) | |
| parent | 188dfea3a75dede5f8a5cab0d62fe130eaced932 (diff) | |
Merge pull request #39 from prife/sim-module
simulator: mingw and app module support
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/SConscript | 3 | ||||
| -rw-r--r-- | libcpu/sim/win32/cpu_port.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libcpu/SConscript b/libcpu/SConscript index a1609d5fd3..0d00976092 100644 --- a/libcpu/SConscript +++ b/libcpu/SConscript @@ -18,6 +18,9 @@ if rtconfig.PLATFORM == 'iar': if rtconfig.PLATFORM == 'cl': src = Glob(path + '/*.c') +if rtconfig.PLATFORM == 'mingw': + src = Glob(path + '/*.c') + CPPPATH = [RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/' + rtconfig.CPU, RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/common'] group = DefineGroup(rtconfig.CPU.upper(), src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/sim/win32/cpu_port.c b/libcpu/sim/win32/cpu_port.c index 38c387b196..6bf3c79cf7 100644 --- a/libcpu/sim/win32/cpu_port.c +++ b/libcpu/sim/win32/cpu_port.c @@ -111,6 +111,7 @@ static DWORD WINAPI ThreadforKeyGet(LPVOID lpParam); static void SetThreadName(DWORD dwThreadID, char* threadName) { +#if defined(_MSC_VER) THREADNAME_INFO info; info.dwType = 0x1000; info.szName = threadName; @@ -124,6 +125,7 @@ static void SetThreadName(DWORD dwThreadID, char* threadName) __except(EXCEPTION_EXECUTE_HANDLER) { } +#endif } /* |