Merge pull request #39 from prife/sim-module

simulator: mingw and  app module support

bsp/simulator/SConstruct

@@ -12,8 +12,8 @@ if os.getenv('RTT_RTGUI'):
 else:
     # set the rtgui root directory by hand
     # empty string means use the RTGUI in svn
-    # RTT_RTGUI = os.path.normpath(r'F:\Project\git\rt-gui\components\rtgui')
-    RTT_RTGUI =''
+    RTT_RTGUI = os.path.normpath(r'F:\Project\git\rt-gui\components\rtgui')
+    # RTT_RTGUI =''
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 from building import *
@@ -51,13 +51,34 @@ if rtconfig.PLATFORM == 'cl':
     env.Append(LINKFLAGS=rtconfig.LFLAGS)
     env['LIBS']=libs
     env['CPPDEFINES']=definitions
+elif rtconfig.PLATFORM == 'mingw':
+    libs = Split('''
+        winmm
+        gdi32
+        winspool
+        comdlg32
+        advapi32
+        shell32
+        ole32
+        oleaut32
+        uuid
+        odbc32
+        odbccp32
+        ''')
+    TARGET = 'rtthread-win32.' + rtconfig.TARGET_EXT
+    env = Environment(tools = ['mingw'],
+        AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
+        CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+        AR = rtconfig.AR, ARFLAGS = '-rc',
+        LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
+    env['LIBS']=libs
+    env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 else:
     TARGET = 'rtthread'
     env.Append(CCFLAGS=rtconfig.CFLAGS)
     env.Append(LINKFLAGS=rtconfig.LFLAGS)
     env.Append(LIBS=['m'])
 
-
 # prepare building environment
 
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False, remove_components=['rtgui'])
@@ -85,8 +106,42 @@ if GetDepend('RT_USING_RTGUI'):
 if GetDepend('RT_USING_TC'):
     objs = objs + SConscript(RTT_ROOT + '/examples/kernel/SConscript', variant_dir = 'build/tc/kernel', duplicate=0)
 
-# build program 
-program = env.Program(TARGET, objs)
+def ObjRemove(objs, remove):
+    for item in objs:
+        # print type(item), os.path.basename(str(item))
+        if os.path.basename(str(item)) in remove:
+             objs.remove(item)
+    return
+
+# build program  -shared
+if GetDepend('RT_USING_MODULE'):
+    # Remove module.c in $RTT_ROOT/src
+    ObjRemove(objs, ['module.obj', 'module.o'])
+
+    AddOption('--def',
+      dest='def',
+      action='store_true',
+      default=False,
+      help='create rthread.def of rtthread.dll on windows')
+    if GetOption('def'):
+        if rtconfig.PLATFORM != 'mingw':
+            print "scons error: `--def' can only work with mingw"
+            exit(1)
+
+        env['LINKFLAGS'] = rtconfig.DEFFILE_LFLAGS
+        env.SharedLibrary("rtthread.dll", objs)
+        program = ''
+    else:
+        if rtconfig.PLATFORM == 'cl':
+            objs += ['rtthread.def']
+        elif rtconfig.PLATFORM == 'mingw':
+            rtconfig.POST_ACTION = 'del /Q rtthread.lib \n rename librtthread.a rtthread.lib\n'
+            # rtconfig.POST_ACTION = 'lib /machine:i386 /def:rtthread.def /out:rtthread.lib'
+        env.SharedLibrary("rtthread.dll", objs)
+        program = env.Program(TARGET, 'dummy.c', LIBS='rtthread', LIBPATH='.')
+
+else:
+    program = env.Program(TARGET, objs)
 
 # end building
 EndBuilding(TARGET, program)

bsp/simulator/applications/SConscript

@@ -6,6 +6,8 @@ src	= Glob('*.c')
 # remove no need file.
 if GetDepend('RT_USING_DFS_WINSHAREDIR') == False:
     SrcRemove(src, 'dfs_win32.c')
+if GetDepend('RT_USING_MODULE') == False:
+    SrcRemove(src, ['module_win32.c'])
 CPPPATH = [cwd, str(Dir('#'))]
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)

bsp/simulator/applications/dfs_win32.c

@@ -27,6 +27,22 @@
 #include <WinError.h>
 #include  <windows.h>
 
+#if defined(__MINGW32__) && defined(_NO_OLDNAMES)
+#define O_RDONLY    _O_RDONLY
+#define O_WRONLY    _O_WRONLY
+#define O_RDWR      _O_RDWR
+#define O_ACCMODE   _O_ACCMODE
+#define O_APPEND    _O_APPEND
+#define O_CREAT     _O_CREAT
+#define O_TRUNC     _O_TRUNC
+#define O_EXCL      _O_EXCL
+#define O_TEXT      _O_TEXT
+#define O_BINARY    _O_BINARY
+#define O_TEMPORARY _O_TEMPORARY
+#define O_NOINHERIT _O_NOINHERIT
+#define O_SEQUENTIAL   _O_SEQUENTIAL
+#define O_RANDOM    _O_RANDOM
+#endif
 /*
  * RT-Thread DFS Interface for win-directory as an disk device
  */
@@ -132,6 +148,14 @@ static char *winpath_dirdup(char *des, const char *src)
     return path;
 }
 
+/* This function can convert the path in rt-thread/dfs to the path in windows */
+char * dfs_win32_dirdup(char * path)
+{
+    char * file_path;
+    file_path = winpath_dirdup(WIN32_DIRDISK_ROOT, path);
+    return file_path;
+}
+
 static int dfs_win32_open(struct dfs_fd *file)
 {
     int fd;

bsp/simulator/drivers/board.c

@@ -53,7 +53,7 @@ void rt_hw_win32_low_cpu(void)
 #endif
 }
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #ifndef _CRT_TERMINATE_DEFINED
 #define _CRT_TERMINATE_DEFINED
 _CRTIMP __declspec(noreturn) void __cdecl exit(__in int _Code);

bsp/simulator/dummy.c

@@ -0,0 +1,4 @@
+int dummy_main()
+{
+	return 0;
+}

bsp/simulator/rtconfig.h

@@ -21,6 +21,10 @@
 
 #elif defined(__GNUC__)
 #define RT_USING_NOLIBC
+
+#if defined(__MINGW32__)
+#define _NO_OLDNAMES   /* to ignore: mode_t in sys/type.h */
+#endif
 #endif
 
 /* SECTION: basic kernel options */
@@ -83,6 +87,7 @@
 /* SECTION: Device System */
 /* Using Device System */
 #define RT_USING_DEVICE
+#define RT_USING_DEVICE_IPC
 /* #define RT_USING_UART1 */
 
 /* SECTION: Console options */
@@ -94,11 +99,14 @@
 /* SECTION: component options */
 #define RT_USING_COMPONENTS_INIT
 
+/* SECTION: APP MODULE  */
+#define RT_USING_MODULE
+
 /* SECTION: MTD interface options */
 /* using mtd nand flash */
 #define RT_USING_MTD_NAND
 /* using mtd nor flash */
-#define RT_USING_MTD_NOR
+/* #define RT_USING_MTD_NOR */
 
 /* SECTION: finsh, a C-Express shell */
 #define RT_USING_FINSH

bsp/simulator/rtconfig.py

@@ -1,7 +1,7 @@
 # toolchains options
 ARCH='sim'
 #CROSS_TOOL='msvc' or 'gcc' or 'mingw' (mingw is not supported yet!)
-CROSS_TOOL='msvc'
+CROSS_TOOL='mingw'
 
 # cross_tool provides the cross compiler
 # EXEC_PATH is the compiler execute path 
@@ -10,11 +10,20 @@ if  CROSS_TOOL == 'gcc':
     PLATFORM  = 'gcc'
     EXEC_PATH = '/usr/bin/gcc'
 
-if  CROSS_TOOL == 'msvc':
+elif  CROSS_TOOL == 'mingw':
+    CPU       = 'win32'
+    PLATFORM  = 'mingw'
+    EXEC_PATH = r'D:\Program Files\CodeBlocks\MinGW\bin'
+
+elif  CROSS_TOOL == 'msvc':
     CPU       = 'win32'
     PLATFORM  = 'cl'
     EXEC_PATH = ''
 
+else :
+    print "bad CROSS TOOL!"
+    exit(1)
+
 BUILD = 'debug'
 #BUILD = ''
 
@@ -48,6 +57,35 @@ if PLATFORM == 'gcc':
 
     POST_ACTION = ''
 
+elif PLATFORM == 'mingw':
+    # toolchains
+    PREFIX = ''
+    CC = PREFIX + 'gcc'
+    AS = PREFIX + 'gcc'
+    AR = PREFIX + 'ar'
+    LINK = PREFIX + 'gcc'
+    TARGET_EXT = 'exe'
+    SIZE = PREFIX + 'size'
+    OBJDUMP = PREFIX + 'objdump'
+    OBJCPY = PREFIX + 'objcopy'
+
+    DEVICE = ' -ffunction-sections -fdata-sections'
+    DEVICE = '  '
+    CFLAGS = DEVICE
+    AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'
+    DEFFILE_LFLAGS = DEVICE + ' -Wl,-Map=rtthread-win32.map,--output-def,rtthread.def -T mingw.ld '
+    LFLAGS = DEVICE + ' -Wl,-Map=rtthread-win32.map -T mingw.ld '
+    CPATH = ''
+    LPATH = ''
+
+    if BUILD == 'debug':
+        CFLAGS += ' -g -O0 -gdwarf-2'
+        AFLAGS += ' -gdwarf-2'
+    else:
+        CFLAGS += ' -O2'
+
+    POST_ACTION = ''
+
 elif PLATFORM == 'cl':
     # toolchains
     PREFIX = ''

bsp/simulator/testdll/SConstruct

@@ -0,0 +1,84 @@
+import os
+import sys
+import SCons.cpp
+import rtconfig
+
+if os.getenv('RTT_ROOT'):
+    RTT_ROOT = os.getenv('RTT_ROOT')
+else:
+    RTT_ROOT = os.path.normpath(os.getcwd() + '/../..')
+
+if os.getenv('RTT_RTGUI'):
+    RTT_RTGUI = os.getenv('RTT_RTGUI')
+else:
+    # set the rtgui root directory by hand
+    # empty string means use the RTGUI in svn
+    RTT_RTGUI = os.path.normpath(r'F:\Project\git\rt-gui\components\rtgui')
+    # RTT_RTGUI =''
+
+sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
+from building import *
+
+Export('RTT_ROOT')
+
+# add target option
+AddOption('--app',
+  dest='app',
+  nargs=1, type='string',
+  action='store',
+  metavar='DIR',
+  help='installation prefix')
+
+# add target option
+AddOption('--type',
+  dest='type',
+  nargs=1, type='string',
+  action='store',
+  metavar='DIR',
+  help='installation prefix')
+
+app = GetOption('app')
+env = Environment()
+CPPPATH = [
+	RTT_ROOT + '/include',
+	RTT_ROOT + '/bsp/' + rtconfig.BSP,
+	RTT_ROOT + '/components/finsh',
+	RTT_ROOT + '/components/libdl',
+	RTT_ROOT + '/components/external/ftk/ftk/src/os/rt-thread',
+	RTT_ROOT + '/components/external/ftk/ftk/src/demos',	
+	RTT_ROOT + '/components/external/ftk/ftk/apps/common',
+	RTT_ROOT + '/components/external/ftk/ftk/src',
+	RTT_ROOT + '/components/dfs', 
+	RTT_ROOT + '/components/dfs/include',
+	RTT_ROOT + '/components/libc/newlib',
+	RTT_ROOT + '/components/external/cairo/cairo-1.10.2/src', 
+	RTT_ROOT + '/components/external/cairo/'
+]
+if RTT_RTGUI:
+	RTGUI_ROOT = RTT_RTGUI
+else:
+	RTGUI_ROOT = RTT_ROOT + '/components/rtgui'
+RTGUI_PATH = [
+	RTGUI_ROOT + '/include',
+	RTGUI_ROOT + '/common',
+	RTGUI_ROOT + '/server',
+	RTGUI_ROOT + '/widgets',
+]
+CPPPATH += RTGUI_PATH
+
+env.Append(CCFLAGS=rtconfig.CFLAGS)
+env.Append(LINKFLAGS=rtconfig.LFLAGS)
+env.Append(CPPPATH=CPPPATH)
+env.Append(LIBS='rtthread', LIBPATH='../')
+env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
+
+PrepareModuleBuilding(env, RTT_ROOT)
+
+#dir = app + '/build/' + rtconfig.BSP
+dir = app + '/build/'
+objs = SConscript(app + '/Sconscript', variant_dir=dir, duplicate=0)
+TARGET = dir + '/' + app + '.' + rtconfig.TARGET_EXT
+
+# build program 
+#env.Program(TARGET, objs)
+env.SharedLibrary(TARGET, objs)

bsp/simulator/testdll/basicapp/Sconscript

@@ -0,0 +1,7 @@
+import rtconfig
+Import('RTT_ROOT')
+from building import *
+
+src	= Glob('*.c')
+group = DefineGroup('', src, depend = [''])
+Return('group')

bsp/simulator/testdll/basicapp/basicapp.c

@@ -0,0 +1,30 @@
+#include <rtthread.h>
+
+static int a = 0;
+static int b = 1000000;
+int c = 100;
+
+static void function(int count1, int count2, int count3)
+{
+	rt_kprintf("Hello RT-Thread %d %d\n", count1, count2, count3);
+}
+
+int main(void)
+{
+	int i;
+
+	rt_kprintf("application entry\n");
+	rt_kprintf("[addr]a-0x%x,b-0x%x,c-0x%x\n", &a, &b, &c);
+	rt_kprintf("[value]a-%d,b-%d,c-%d\n", a, b, c);
+	
+	for(i=0; i<100; i++)  
+	{	
+		a++;
+		b--;
+		c++;
+		function(a, c, b );
+	}
+ 
+	return 0;
+}
+

bsp/simulator/testdll/label/Sconscript

@@ -0,0 +1,7 @@
+import rtconfig
+Import('RTT_ROOT')
+from building import *
+
+src	= Glob('*.c')
+group = DefineGroup('', src, depend = [''])
+Return('group')

bsp/simulator/testdll/label/label_demo1.c

@@ -0,0 +1,74 @@
+#include <rtthread.h>
+
+#include <rtgui/rtgui.h>
+#include <rtgui/rtgui_app.h>
+#include <rtgui/widgets/window.h>
+#include <rtgui/widgets/label.h>
+#include <rtgui/driver.h>
+
+/* 在LCD上创建一个主窗口，这是第一个窗口 */
+static void win_thread_entry(void *parameter)
+{
+    struct rtgui_app *app;
+    struct rtgui_win *win;
+    struct rtgui_label *label;
+    struct rtgui_rect rect;
+
+    app = rtgui_app_create(rt_thread_self(), "MyApp");
+    RT_ASSERT(app != RT_NULL);
+
+    /* create a full screen window */
+    rtgui_graphic_driver_get_rect(rtgui_graphic_driver_get_default(), &rect);
+
+    win = rtgui_win_create(RT_NULL, "MainWin", &rect,
+                           RTGUI_WIN_STYLE_NO_BORDER | RTGUI_WIN_STYLE_NO_TITLE);
+    if (win == RT_NULL)
+    {
+        rtgui_app_destroy(app);
+        return;
+    }
+
+    /* 建立一个label，内容为helloworld */
+    label = rtgui_label_create("Hello World!");
+
+    /* 设置label的位置，这里是绝对坐标 */
+	rect.x1 = 0;
+	rect.y1 = 100;
+	rect.x2 = 240;
+	rect.y2 = 140;
+    rtgui_widget_set_rect(RTGUI_WIDGET(label), &rect);
+
+	rt_kprintf("bc: %x\n", RTGUI_WIDGET_BACKGROUND(label));
+	rt_kprintf("fc: %x\n", RTGUI_WIDGET_FOREGROUND(label));
+#if 0
+	RTGUI_WIDGET_BACKGROUND(label) = 0;
+	RTGUI_WIDGET_FOREGROUND(label) = RTGUI_RGB(0xFF, 0xFF, 0);
+#endif
+
+    /*添加label到主窗口*/
+    rtgui_container_add_child(RTGUI_CONTAINER(win), RTGUI_WIDGET(label));
+
+    /* 显示主窗口 */
+    rtgui_win_show(win, RT_FALSE);
+
+    /* 循环 */
+    rtgui_app_run(app);
+
+    rtgui_win_destroy(win);
+    rtgui_app_destroy(app);
+    rt_kprintf("MyApp Quit.\n");
+}
+
+int main()
+{
+    rt_thread_t tid;
+
+    tid = rt_thread_create("win", win_thread_entry, RT_NULL,
+                           2048, 20, 20);
+    if (tid != RT_NULL)
+    {
+        rt_thread_startup(tid);
+    }
+
+    return 0;
+}

bsp/simulator/testdll/rtconfig.py

@@ -0,0 +1,51 @@
+# bsp name
+BSP = 'simulator'
+
+# toolchains
+EXEC_PATH = ''
+PREFIX = ''
+TARGET_EXT = 'dll'
+AS = PREFIX + 'cl'
+CC = PREFIX + 'cl'
+AR = PREFIX + 'cl'
+LINK = PREFIX + 'cl'
+AFLAGS = ''
+CFLAGS = ''
+LFLAGS = ''
+BUILD = 'debug'
+
+if BUILD == 'debug':
+    CFLAGS += ' /MTd'
+    LFLAGS += ' /DEBUG'
+else:
+    CFLAGS += ' /MT'
+    LFLAGS += ''
+
+CFLAGS += ' /ZI /Od /W 3 /WL'
+LFLAGS += ' /DEF:rttapp.def /SUBSYSTEM:CONSOLE /MACHINE:X86'
+#LFLAGS += ' /DEF:rttapp.def /SUBSYSTEM:WINDOWS /MACHINE:X86' #/ENTRY:mainCRTStartup 
+
+CPATH = ''
+LPATH = ''
+
+'''
+EXEC_PATH 	= 'C:/Program Files/CodeSourcery/Sourcery G++ Lite/bin'
+PREFIX = 'arm-none-eabi-'
+CC = PREFIX + 'gcc'
+CXX = PREFIX + 'g++'
+AS = PREFIX + 'gcc'
+AR = PREFIX + 'ar'
+LINK = PREFIX + 'gcc'
+TARGET_EXT = 'so'
+SIZE = PREFIX + 'size'
+OBJDUMP = PREFIX + 'objdump'
+OBJCPY = PREFIX + 'objcopy'
+
+DEVICE = ' -mcpu=arm920t'
+CFLAGS = DEVICE + ' -O0 -fPIC -DFTK_AS_PLUGIN -DRT_THREAD '
+AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'
+LFLAGS = DEVICE + ' -Wl,-z,max-page-size=0x4 -shared -fPIC -nostdlib -s'
+
+CPATH = ''
+LPATH = ''
+'''

bsp/simulator/testdll/rttapp.def

@@ -0,0 +1,3 @@
+LIBRARY app
+EXPORTS
+main

bsp/simulator/testdll/snake/SConscript

@@ -0,0 +1,7 @@
+import rtconfig
+Import('RTT_ROOT')
+from building import *
+
+src	= Glob('*.c')
+group = DefineGroup('', src, depend = [''])
+Return('group')

bsp/simulator/testdll/snake/snake.h

@@ -0,0 +1,68 @@
+#ifndef _SNAKE_H_
+#define _SNAKE_H_
+
+#include <rtthread.h>
+
+#define snake_length_max                  20  //最大蛇长
+#define snake_length_init                 3   //初始化蛇长
+#define snake_room_size_hight             8   //房子高 0-255 建议>8
+#define snake_room_size_widht             8   //房子宽 0-255 建议>8
+
+#define snake_init_pointx               1
+#define snake_init_pointy               2
+
+typedef struct
+{
+    rt_int32_t x, y;
+} point_t;
+
+typedef struct
+{
+    rt_int32_t width;       // max x
+    rt_int32_t height;      // max y
+    rt_uint8_t *range;      // map, map->range[y * map->width + x]
+    point_t snake_flush[2];
+    point_t food_flush[1];
+} map_t;
+
+typedef enum
+{
+    SNAKE_DIR_UP,
+    SNAKE_DIR_DOWN,
+    SNAKE_DIR_LEFT,
+    SNAKE_DIR_RIGHT
+} SNAKE_DIR;
+
+typedef enum
+{
+    FOOD,       // 吃到水果
+    OVER,       // 咬到自身
+    NORMAL      // 正常行动
+} SYS_STE;
+
+typedef struct
+{
+    point_t body;
+    rt_list_t list;
+} snake_t;
+
+// 构造一个地图
+map_t *map_init(rt_uint32_t width, rt_uint32_t heigth);
+
+// 构造一条指定长度的蛇在指定点
+rt_bool_t snake_init(const point_t *start, const int length, const SNAKE_DIR dir, map_t *map);
+
+// 构造出食物
+rt_bool_t food_init(map_t *map, rt_uint32_t max_num);
+
+void map_deinit(map_t *map);
+
+void snake_deinit(void);
+
+void food_deinit(void);
+
+SYS_STE snake_step(SNAKE_DIR dir, map_t *map);
+
+rt_bool_t snake_restart(const point_t *start, const int length, const SNAKE_DIR dir, map_t *map);
+
+#endif

bsp/simulator/testdll/var/Sconscript

@@ -0,0 +1,7 @@
+import rtconfig
+Import('RTT_ROOT')
+from building import *
+
+src	= Glob('*.c')
+group = DefineGroup('', src, depend = [''])
+Return('group')

bsp/simulator/testdll/var/var.c

@@ -0,0 +1,20 @@
+#include <rtthread.h>
+
+/* rtgui\common\rtgui_object.c */
+_declspec(dllimport) void * _rtgui_object;
+
+/* rtgui\common\color.c */
+_declspec(dllimport) rt_uint32_t blue; 
+//extern rt_uint32_t * green;
+
+int main(void)
+{
+	int i;
+
+	//rt_kprintf("green = %x, *green", green, *(rt_uint32_t *)green);
+	rt_kprintf("blue = %x\n", blue);
+	rt_kprintf("_rtgui_object = %x\n", _rtgui_object);
+	
+	return 0;
+}
+

include/rtm.h

@@ -21,6 +21,9 @@ struct rt_module_symtab
     const char *name;
 };
 
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define RTM_EXPORT(symbol)
+#else
 #define RTM_EXPORT(symbol)                                            \
 const char __rtmsym_##symbol##_name[] = #symbol;                      \
 const struct rt_module_symtab __rtmsym_##symbol SECTION("RTMSymTab")= \
@@ -28,6 +31,8 @@ const struct rt_module_symtab __rtmsym_##symbol SECTION("RTMSymTab")= \
     (void *)&symbol,                                                  \
     __rtmsym_##symbol##_name                                          \
 };
+#endif
+
 #else
 #define RTM_EXPORT(symbol)
 #endif

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)
 

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
 }
 
 /*