Merge pull request #50 from ehello/rel-5-0

chw 's change

build/rules-arm.freertos

@@ -0,0 +1,36 @@
+
+
+# set your own targaet_os
+TARGET_OS=freertos
+
+##################################################
+# set your compile tool #
+CC=arm-linux-gnueabihf-gcc
+CXX=arm-linux-gnueabihf-g++
+CPP=arm-linux-gnueabihf-g++
+AR=arm-linux-gnueabihf-ar
+AS=arm-linux-gnueabihf-as
+RANLIB=arm-linux-gnueabihf-ranlib
+MAKE=/usr/bin/make
+##################################################
+
+ARFLAGS=-rc
+COFLAG=-c
+
+OBJ=o
+LIBA=a
+
+##################################################
+# if you don't want to create dynamic, delete it # 
+LIBSO=so
+SOFLAGS=-fPIC -shared -o
+##################################################
+
+
+##################################################
+# set your compile flags and install prefix path # 
+PREFIX=/usr/local
+CFLAGS+=-g -Wall -fPIC 
+LDFLAGS+=
+##################################################
+

configure.ac

@@ -94,7 +94,7 @@ osname="unspecified"
 runtime_mode="procs"
 compositing_schema="no"
 virtual_window="no"
-use_shmopen="yes"
+use_shmopen="no"
 mgslice_use_fallback="no"
 
 incore_res="no"

src/kernel/makefile.ng

@@ -15,7 +15,7 @@ libkernel_la_SOURCES = timer.c \
                        desktop-ths.c desktop-sa.c desktop-procs.c \
                        cursor.c cursor-procs.c cursor-sa.c \
                        sharedres.c \
-                       message.c event.c \
+                       message.c event.c listenfd.c \
                        blockheap.c fixstr.c slotset.c zorder.c
 endif
 

src/libc/mgslice.c

@@ -362,7 +362,7 @@ static void mg_slice_init_nomessage (void)
         sys_page_size = system_info.dwPageSize;
     }
 #else
-    sys_page_size = sysconf (_SC_PAGESIZE); /* = sysconf (_SC_PAGE_SIZE); = getpagesize(); */
+    sys_page_size =  getpagesize(); /* = sysconf (_SC_PAGE_SIZE); = getpagesize(); */
 #endif
     mem_assert (sys_page_size >= 2 * LARGEALIGNMENT);
     mem_assert ((sys_page_size & (sys_page_size - 1)) == 0);

src/makefile.ng

@@ -13,6 +13,7 @@ MINIGUILIB=libminigui-$(MINIGUI_VER)
 # specific defines
 
 COMM_LDADD=						\
+	standalone/libstandalone.$(LIBA) \
 	libc/liblibc.$(LIBA)				\
 	misc/libmisc.$(LIBA)				\
 	control/libcontrol.$(LIBA)		\

src/misc/makefile.ng

@@ -4,14 +4,15 @@ INCLUDES = -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/include
 noinst_LTLIBRARIES = libmisc.la
 
 EXTRA_DIST= misc.c systext.c rwops.c endianrw.c nposix.c clipboard.c \
-			math.c about.c error.c sockio.c rc4.c rc4.h \
-            makefile.ng makefile.msvc
+			math.c about.c error.c sockio.c  rc4.c rc4.h \
+      makefile.ng makefile.msvc
 
 ifdef MG_MINIMALGDI
 libmisc_la_SOURCES = misc.c math.c rwops.c nposix.c
 else
 libmisc_la_SOURCES = misc.c systext.c rwops.c endianrw.c nposix.c clipboard.c \
-				math.c about.c license.c error.c sockio.c rc4.c
+				math.c about.c license.c anon_file.c rbtree.c map.c \
+				error.c sockio.c
 endif
 
 SRC_FILES = $(libmisc_la_SOURCES)

src/misc/nposix.c

@@ -414,7 +414,7 @@ unsigned int __mg_os_get_random_seed (void)
     unsigned int rt_tick_get(void);
     return rt_tick_get();
 #elif defined (__FREERTOS__)
-#error "Please implement __mg_os_get_random_seed for FreeRTOS"
+    return 0; // just return zero for now.
 #else
     /*other os use time, for example: linux, OSE, etc.*/
     return time (NULL);
@@ -452,7 +452,8 @@ void __mg_os_time_delay (int ms)
     extern int rt_thread_mdelay(int ms);
     rt_thread_mdelay(ms);
 #elif defined (__FREERTOS__)
-#error "Please implement __mg_os_time_delay for FreeRTOS"
+    extern void vTaskDelay(int xTicksToDelay);
+    vTaskDelay(ms);
 #else
 #error "Please implement __mg_os_time_delay for your OS"
 #endif

src/standalone/makefile.ng

@@ -0,0 +1,16 @@
+abs_top_srcdir=../..
+
+INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include
+
+noinst_LTLIBRARIES = libstandalone.la
+
+
+libstandalone_la_SOURCES = standalone.c
+
+
+SRC_FILES = $(libstandalone_la_SOURCES)
+LIB_NAME=libstandalone
+
+
+
+include ../../rules.make

src/sysres/mgetc.c

@@ -70,10 +70,10 @@ static char* _system_keys[]={
 };
 static char* _system_values[]={
 // GAL engine and default options
-    "pc_xvfb",
-    "800x600-16bpp",
+    "commlcd",
+    "160x80-16bpp",
 // IAL engine
-    "pc_xvfb",
+    "comm",
     "/dev/input/mice",
     "IMPS2"
 };