From: Martin Vajnar Date: Fri, 13 Sep 2013 13:31:38 +0000 (+0200) Subject: ANDROID: allow compilation from command line add new orte_config.h X-Git-Url: https://rtime.felk.cvut.cz/gitweb/orte.git/commitdiff_plain/7cc69d6a911930cb39df5804aa5150d8767b4760 ANDROID: allow compilation from command line add new orte_config.h This allows compilation of native code with ndk-build and of Java part with ant. --- diff --git a/orte/Robot_Demo/build.xml b/orte/Robot_Demo/build.xml new file mode 100644 index 0000000..75cd3f2 --- /dev/null +++ b/orte/Robot_Demo/build.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/orte/Robot_Demo/gen/org/ocera/orte/R.java b/orte/Robot_Demo/gen/org/ocera/orte/R.java deleted file mode 100644 index d6c47c6..0000000 --- a/orte/Robot_Demo/gen/org/ocera/orte/R.java +++ /dev/null @@ -1,20 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ -package org.ocera.orte; - -public final class R { - public static final class drawable { - public static final int ic_launcher = 0x7f020000; - } - public static final class string { - public static final int app_name = 0x7f040000; - } - public static final class style { - public static final int AppBaseTheme = 0x7f050000; - public static final int AppTheme = 0x7f050001; - } -} diff --git a/orte/Robot_Demo/gen/org/ocera/orte/demo/BuildConfig.java b/orte/Robot_Demo/gen/org/ocera/orte/demo/BuildConfig.java deleted file mode 100644 index 7d1bf6f..0000000 --- a/orte/Robot_Demo/gen/org/ocera/orte/demo/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.ocera.orte.demo; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java deleted file mode 100644 index 81bf7ef..0000000 --- a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java +++ /dev/null @@ -1,111 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package org.ocera.orte.demo; - -public final class R { - public static final class attr { - } - public static final class drawable { - public static final int ic_launcher=0x7f020000; - public static final int logo_cvut=0x7f020001; - public static final int logo_flamingos=0x7f020002; - } - public static final class id { - public static final int about=0x7f07001a; - public static final int crane=0x7f070017; - public static final int editText1=0x7f07000a; - public static final int editText2=0x7f07000d; - public static final int editText3=0x7f070010; - public static final int editText4=0x7f070013; - public static final int exit=0x7f07001b; - public static final int hokuyo=0x7f070016; - public static final int hokuyo_view=0x7f070004; - public static final int hokuyo_view_bg=0x7f070003; - public static final int imageView1=0x7f070001; - public static final int magnet=0x7f070018; - public static final int managers=0x7f070006; - public static final int ownIP=0x7f070007; - public static final int scrollView1=0x7f070000; - public static final int scrollView2=0x7f070005; - public static final int scrollView3=0x7f070008; - public static final int speed=0x7f070014; - public static final int speed_mon=0x7f070015; - public static final int tableRow1=0x7f070009; - public static final int tableRow2=0x7f07000b; - public static final int tableRow3=0x7f07000e; - public static final int tableRow4=0x7f070011; - public static final int textView1=0x7f070002; - public static final int textView2=0x7f07000c; - public static final int textView3=0x7f07000f; - public static final int textView4=0x7f070012; - public static final int voltage=0x7f070019; - } - public static final class layout { - public static final int about_dialog=0x7f030000; - public static final int hokuyo_view=0x7f030001; - public static final int managers_view=0x7f030002; - public static final int status_dialog=0x7f030003; - } - public static final class menu { - public static final int activity_main=0x7f060000; - } - public static final class string { - public static final int app_name=0x7f040000; - } - public static final class style { - /** - Base application theme, dependent on API level. This theme is replaced - by AppBaseTheme from res/values-vXX/styles.xml on newer devices. - - - Theme customizations available in newer API levels can go in - res/values-vXX/styles.xml, while customizations related to - backward-compatibility can go here. - - - Base application theme for API 11+. This theme completely replaces - AppBaseTheme from res/values/styles.xml on API 11+ devices. - - API 11 theme customizations can go here. - - Base application theme for API 14+. This theme completely replaces - AppBaseTheme from BOTH res/values/styles.xml and - res/values-v11/styles.xml on API 14+ devices. - - API 14 theme customizations can go here. - - Base application theme, dependent on API level. This theme is replaced - by AppBaseTheme from res/values-vXX/styles.xml on newer devices. - - - Theme customizations available in newer API levels can go in - res/values-vXX/styles.xml, while customizations related to - backward-compatibility can go here. - - - Base application theme for API 11+. This theme completely replaces - AppBaseTheme from res/values/styles.xml on API 11+ devices. - - API 11 theme customizations can go here. - - Base application theme for API 14+. This theme completely replaces - AppBaseTheme from BOTH res/values/styles.xml and - res/values-v11/styles.xml on API 14+ devices. - - API 14 theme customizations can go here. - */ - public static final int AppBaseTheme=0x7f050000; - /** Application theme. - All customizations that are NOT specific to a particular API-level can go here. - Application theme. - All customizations that are NOT specific to a particular API-level can go here. - */ - public static final int AppTheme=0x7f050001; - public static final int voltage_dialog=0x7f050002; - } -} diff --git a/orte/include/orte/orte_config.h b/orte/include/orte/orte_config.h index be4c4ce..080641c 100644 --- a/orte/include/orte/orte_config.h +++ b/orte/include/orte/orte_config.h @@ -1,5 +1,11 @@ -/* orte/include/config.h. Generated by configure. */ -/* orte/include/config.h.in. Generated from configure.in by autoheader. */ +/* orte/include/orte/orte_config.h. Generated from orte_config.h.in by configure. */ +/* orte/include/orte/orte_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define to enable JORTE's compilation */ +/* #undef CONFIG_JORTE */ /* Define if is target CYGWIN */ /* #undef CONFIG_ORTE_CYGWIN */ @@ -19,6 +25,12 @@ /* Define if kernel is RTLinux patched */ /* #undef CONFIG_ORTE_RTL */ +/* Define if onetd stack is found */ +/* #undef CONFIG_ORTE_RTL_ONETD */ + +/* Define if wIP stack is found */ +/* #undef CONFIG_ORTE_RTL_WIP */ + /* Define if is target a unix system */ #define CONFIG_ORTE_UNIX 1 @@ -37,6 +49,13 @@ /* Define to 1 if you have the header file. */ #define HAVE_CTYPE_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ENDIAN_H 1 + +/* Define to 1 if you have the header file. */ #define HAVE_ERRNO_H 1 /* Define to 1 if you have the header file. */ @@ -54,9 +73,18 @@ /* Define for ORTE getopt_long self implemetation */ /* #undef HAVE_GETPOT_LONG_ORTE */ +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `c_r' library (-lc_r). */ +/* #undef HAVE_LIBC_R */ + /* Define to 1 if you have the `nsl' library (-lnsl). */ #define HAVE_LIBNSL 1 +/* Define to 1 if you have the `popt' library (-lpopt). */ +/* #undef HAVE_LIBPOPT */ + /* Define to 1 if you have the `pthread' library (-lpthread). */ #define HAVE_LIBPTHREAD 1 @@ -90,6 +118,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_LINUX_TYPES_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_NETDB_H 1 @@ -105,6 +136,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_NIC_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ONETD_H */ + /* Define to 1 if you have the header file. */ #define HAVE_PTHREAD_H 1 @@ -132,8 +166,8 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 @@ -141,12 +175,18 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_IOCTL_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_SOCKET_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_SOCKIO_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 @@ -162,6 +202,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_W32API_WINDOWS_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ @@ -171,11 +214,15 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WS2TCPIP_H */ -/* Name of package */ -#define ORTE_PACKAGE "orte" +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ /* Define to the address where bug reports for this package should be sent. */ -#define ORTE_PACKAGE_BUGREPORT "petr.smolik@wo.cz" +#define ORTE_PACKAGE_BUGREPORT "orte@rtime.felk.cvut.cz" /* Define to the full name of this package. */ #define ORTE_PACKAGE_NAME "orte" @@ -186,30 +233,32 @@ /* Define to the one symbol short name of this package. */ #define ORTE_PACKAGE_TARNAME "orte" +/* Define to the home page for this package. */ +#define ORTE_PACKAGE_URL "http://orte.sf.net" + /* Define to the version of this package. */ #define ORTE_PACKAGE_VERSION "0.3.3" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Version number of package */ -#define ORTE_VERSION "0.3.3" - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif -#include -#ifdef __BYTE_ORDER -#if __BYTE_ORDER == __BIG_ENDIAN -#define WORDS_BIGENDIAN 1 -#endif -#endif /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -219,3 +268,23 @@ #ifndef __cplusplus /* #undef inline */ #endif + + +#if defined(HAVE_ENDIAN_H) || defined(HAVE_SYS_PARAM_H) + #ifdef HAVE_SYS_PARAM_H + #include + #endif + #if defined(HAVE_ENDIAN_H) && !defined(BYTE_ORDER) && !defined(__BYTE_ORDER) + #include + #endif + #if defined(__BYTE_ORDER) + #if __BYTE_ORDER == __BIG_ENDIAN + #define WORDS_BIGENDIAN 1 + #endif + #elif defined(BYTE_ORDER) + #if BYTE_ORDER == BIG_ENDIAN + #define WORDS_BIGENDIAN 1 + #endif + #endif +#endif + diff --git a/orte/libaorte/build.xml b/orte/libaorte/build.xml new file mode 100644 index 0000000..83e6f13 --- /dev/null +++ b/orte/libaorte/build.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/orte/libaorte/gen/org/ocera/orte/BuildConfig.java b/orte/libaorte/gen/org/ocera/orte/BuildConfig.java deleted file mode 100644 index 9113210..0000000 --- a/orte/libaorte/gen/org/ocera/orte/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.ocera.orte; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/orte/libaorte/gen/org/ocera/orte/R.java b/orte/libaorte/gen/org/ocera/orte/R.java deleted file mode 100644 index 65affb1..0000000 --- a/orte/libaorte/gen/org/ocera/orte/R.java +++ /dev/null @@ -1,47 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package org.ocera.orte; - -public final class R { - public static final class attr { - } - public static final class drawable { - public static int ic_launcher=0x7f020000; - } - public static final class string { - public static int app_name=0x7f030000; - } - public static final class style { - /** - Base application theme, dependent on API level. This theme is replaced - by AppBaseTheme from res/values-vXX/styles.xml on newer devices. - - - Theme customizations available in newer API levels can go in - res/values-vXX/styles.xml, while customizations related to - backward-compatibility can go here. - - - Base application theme for API 11+. This theme completely replaces - AppBaseTheme from res/values/styles.xml on API 11+ devices. - - API 11 theme customizations can go here. - - Base application theme for API 14+. This theme completely replaces - AppBaseTheme from BOTH res/values/styles.xml and - res/values-v11/styles.xml on API 14+ devices. - - API 14 theme customizations can go here. - */ - public static int AppBaseTheme=0x7f040000; - /** Application theme. - All customizations that are NOT specific to a particular API-level can go here. - */ - public static int AppTheme=0x7f040001; - } -} diff --git a/orte/libaorte/src/org/ocera/orte/package-info.java b/orte/libaorte/src/org/ocera/orte/package-info.java deleted file mode 100644 index 4c539ef..0000000 --- a/orte/libaorte/src/org/ocera/orte/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * - */ -/** - * @author martin - * - */ -package org.ocera.orte; \ No newline at end of file diff --git a/orte/libaorte/src/org/ocera/orte/tools/package-info.java b/orte/libaorte/src/org/ocera/orte/tools/package-info.java deleted file mode 100644 index c5f1808..0000000 --- a/orte/libaorte/src/org/ocera/orte/tools/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * - */ -/** - * @author martin - * - */ -package org.ocera.orte.tools; \ No newline at end of file diff --git a/orte/libaorte/src/org/ocera/orte/types/package-info.java b/orte/libaorte/src/org/ocera/orte/types/package-info.java deleted file mode 100644 index 407634e..0000000 --- a/orte/libaorte/src/org/ocera/orte/types/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * - */ -/** - * @author martin - * - */ -package org.ocera.orte.types; \ No newline at end of file