Skip to content

Commit

Permalink
Init from waze Symbian 1.2.2.2
Browse files Browse the repository at this point in the history 
With very minor compilation fixes
  • Loading branch information
@maximuska
maximuska committed Oct 21, 2009
1 parent e3d5581 commit e1f8ca4
Show file tree
Hide file tree
Showing 1,483 changed files with 225,452 additions and 434,956 deletions.
109 changes: 86 additions & 23 deletions Makefile
View file
Expand Up @@ -17,6 +17,11 @@ INSTALL_DATA = install -m644


# --- Tool specific options ------------------------------------------------
ifeq ($(DESKTOP),ANDROID)
include android/Makefile.in.android
LIB_INCLUDES = -Izlib -Ifreetype/include -Iandroid
#ZLIB = zlib/libz.a
endif

ifeq ($(DESKTOP),IPHONE)

Expand Down Expand Up @@ -44,16 +49,21 @@ ifeq ($(MODE),DEBUG)
# then use the mtrace tool to analyze the output.
ifeq ($(DESKTOP),IPHONE)
MODECFLAGS=-g $(WARNFLAGS) -ggdb -march=armv6 -mcpu=arm1176jzf-s
else
ifeq ($(DESKTOP),ANDROID)
MODELDFLAGS=
else
MODECFLAGS=-g $(WARNFLAGS) -DROADMAP_DEBUG_HEAP -DNOIGNORE
endif
endif
MODELDFLAGS=
else
ifeq ($(MODE),PROFILE)
MODECFLAGS=-g $(WARNFLAGS) -pg -fprofile-arcs -g
MODELDFLAGS=-pg
else
MODECFLAGS=-O2 -ffast-math -fomit-frame-pointer -DNDEBUG=1 $(WARNFLAGS) $(OPTIONS)
MODECFLAGS=-O2 -ffast-math -fomit-frame-pointer -DNDEBUG=1 $(WARNFLAGS) $(OPTIONS) -DFORCE_INLINE -DINLINE_DEC='extern inline' -fexpensive-optimizations -ffast-math -falign-functions=32 -falign-loops -falign-labels -falign-jumps

MODELDFLAGS=
endif
endif
Expand All @@ -65,7 +75,10 @@ else
SSDCFLAGS=
endif

ifeq ($(CSV_GPS),YES)
ifeq ($(CSV_GPS),REALTIME)
CSVGPSFLAGS=-DCSV_GPS -DCSV_REALTIME
csv_gps_c=roadmap_gps_csv.c
else ifeq ($(CSV_GPS),YES)
# Small screen devices
CSVGPSFLAGS=-DCSV_GPS
csv_gps_c=roadmap_gps_csv.c
Expand All @@ -81,14 +94,17 @@ else
J2MECFLAGS=
endif

ifeq ($(DESKTOP),ANDROID)
RDMODULES=android
else
ifeq ($(DESKTOP),GTK2)
RDMODULES=gtk2
else
ifeq ($(DESKTOP),GPE)
RDMODULES=gtk2
else
ifeq ($(DESKTOP),GTK)
RDMODULES=gtk
RDMODULES=gtk
else
ifeq ($(DESKTOP),QT)
RDMODULES=qt
Expand All @@ -108,6 +124,7 @@ endif
endif
endif
endif
endif

ifeq ($(TOUCH), YES)
TOUCHFLAGS=-DTOUCH_SCREEN
Expand All @@ -122,7 +139,8 @@ else
ARFLAGS="r"
endif

CFLAGS=$(MODECFLAGS) $(CSVGPSFLAGS) $(SSDCFLAGS) $(J2MECFLAGS) $(IPHONEFLAGS) $(TOUCHFLAGS) -I$(PROJ_NAME)/src/ -I/usr/local/include -I$(PWD)
CFLAGS=$(MODECFLAGS) $(CSVGPSFLAGS) $(SSDCFLAGS) $(J2MECFLAGS) $(IPHONEFLAGS) $(TOUCHFLAGS) $(CFLAGS_ANDROID) $(LIB_INCLUDES) -I$(PROJ_NAME)/src/ -I/usr/local/include -I$(PWD)

LDFLAGS=$(MODELDFLAGS)

RDMLIBS=libroadmap.a unix/libosroadmap.a libroadmap.a
Expand Down Expand Up @@ -163,7 +181,6 @@ RMLIBSRCS=roadmap_log.c \
$(csv_gps_c) \
roadmap_io.c \
roadmap_gps.c \
roadmap_object.c \
roadmap_state.c \
roadmap_driver.c \
roadmap_adjust.c \
Expand All @@ -173,8 +190,23 @@ RMLIBSRCS=roadmap_log.c \
roadmap_net_mon.c \
roadmap_cyclic_array.c \
roadmap_device_events.c \
roadmap_sunrise.c \
roadmap_power.c \
roadmap_camera_image.c \
roadmap_httpcopy_async.c \
roadmap.c \
roadmap_tile_manager.c \
roadmap_tile_storage.c \
roadmap_tile_status.c \
roadmap_tile.c \
roadmap_warning.c \
roadmap_tripserver.c \
roadmap_jpeg.c \
roadmap_gzm.c \
roadmap_sunrise.c
roadmap_debug_info.c \
roadmap_zlib.c \
roadmap_map_download.c


RMLIBOBJS=$(RMLIBSRCS:.c=.o)

Expand All @@ -184,6 +216,7 @@ RMGUISRCS=roadmap_sprite.c \
roadmap_screen_obj.c \
roadmap_bar.c \
roadmap_general_settings.c \
roadmap_mood.c \
roadmap_car.c \
roadmap_trip.c \
roadmap_skin.c \
Expand All @@ -196,6 +229,8 @@ RMGUISRCS=roadmap_sprite.c \
roadmap_softkeys.c \
roadmap_utf8.c \
roadmap_display.c \
roadmap_ticker.c \
roadmap_twitter.c \
roadmap_border.c \
roadmap_factory.c \
roadmap_preferences.c \
Expand All @@ -208,12 +243,19 @@ RMGUISRCS=roadmap_sprite.c \
roadmap_help.c \
roadmap_label.c \
roadmap_res.c \
roadmap_start.c
roadmap_login.c \
auto_hide_dlg.c \
roadmap_welcome_wizard.c \
roadmap_geo_location_info.c \
roadmap_start.c \
roadmap_geo_config.c \
roadmap_alternative_routes.c

ifneq ($(SSD),YES)
RMLIBSRCS += roadmap_address.c
RMGUISRCS += roadmap_address.c
else
RMLIBSRCS += roadmap_search.c roadmap_address_ssd.c roadmap_address_tc.c ssd/ssd_login_details.c
RMGUISRCS += roadmap_address_ssd.c roadmap_address_tc.c roadmap_search.c address_search/address_search.c address_search/address_search_dlg.c address_search/local_search.c address_search/local_search_dlg.c address_search/generic_search_dlg.c address_search/generic_search.c ssd/ssd_progress.c \
roadmap_login_ssd.c
endif

RMGUIOBJS=$(RMGUISRCS:.c=.o)
Expand All @@ -224,6 +266,8 @@ RMPLUGINSRCS=roadmap_copy.c \
editor/editor_main.c \
editor/editor_plugin.c \
editor/editor_screen.c \
editor/editor_points.c \
editor/editor_cleanup.c \
editor/static/add_alert.c \
editor/static/update_range.c \
editor/static/edit_marker.c \
Expand Down Expand Up @@ -260,6 +304,7 @@ RMPLUGINSRCS=roadmap_copy.c \
navigate/navigate_cost.c \
navigate/navigate_route_astar.c \
navigate/fib-1.1/fib.c \
navigate/navigate_route_trans.c \

RMPLUGINOBJS=$(RMPLUGINSRCS:.c=.o)

Expand All @@ -273,19 +318,27 @@ RTSRCS=Realtime/Realtime.c \
Realtime/RealtimeNetDefs.c \
Realtime/RealtimeNetRec.c \
Realtime/RealtimeUsers.c \
Realtime/WebServiceAddress.c \
Realtime/String.c \
Realtime/RealtimeMath.c \
Realtime/RealtimeTransactionQueue.c \
Realtime/RealtimePacket.c \
Realtime/realtime_roadmap_net.c \
Realtime/RealtimeDefs.c \
Realtime/RealtimeSystemMessage.c \
Realtime/RealtimePrivacy.c \
Realtime/RealtimeOffline.c \
Realtime/RealtimeAltRoutes.c \


RTOBJS=$(RTSRCS:.c=.o)

WEBSVCSRCS=websvc_trans/cyclic_buffer.c \
websvc_trans/efficient_buffer.c \
websvc_trans/socket_async_receive.c \
websvc_trans/string_parser.c \
websvc_trans/web_date_format.c \
websvc_trans/websvc_address.c \
websvc_trans/websvc_trans_queue.c \
websvc_trans/websvc_trans.c

WEBSVCOBJS=$(WEBSVCSRCS:.c=.o)

SSD_WIDGETS_SRCS=ssd/ssd_dialog.c \
ssd/ssd_widget.c \
ssd/ssd_container.c \
Expand All @@ -294,19 +347,26 @@ SSD_WIDGETS_SRCS=ssd/ssd_dialog.c \
ssd/ssd_button.c \
ssd/ssd_list.c \
ssd/ssd_generic_list_dialog.c \
ssd/ssd_keyboard.c \
ssd/ssd_keyboard.c \
ssd/ssd_keyboard_layout.c \
ssd/ssd_keyboard_dialog.c \
ssd/ssd_menu.c \
ssd/ssd_messagebox.c \
ssd/ssd_confirm_dialog.c \
ssd/ssd_confirm_dialog.c \
ssd/ssd_choice.c \
ssd/ssd_checkbox.c \
ssd/ssd_combobox.c \
ssd/ssd_combobox.c \
ssd/ssd_combobox_dialog.c \
ssd/ssd_contextmenu.c \
ssd/ssd_tabcontrol.c \
ssd/ssd_bitmap.c \
ssd/ssd_contextmenu.c \
ssd/ssd_tabcontrol.c \
ssd/ssd_bitmap.c \
ssd/ssd_popup.c \
ssd/ssd_separator.c \
ssd/ssd_icon.c \
roadmap_strings.c \
ssd/ssd_widget_tab_order.c \
ssd/ssd_progress_msg_dialog.c \
roadmap_strings.c


SSD_WIDGETS_OBJS=$(SSD_WIDGETS_SRCS:.c=.o)

Expand All @@ -332,11 +392,14 @@ clean: cleanone
if [ -d unix ] ; then $(MAKE) -C unix cleanone ; fi
if [ -d iphone ] ; then $(MAKE) -C iphone clean ; fi
if [ -d zlib ] ; then $(MAKE) -C zlib clean ; fi
find address_search -name \*.o -exec rm {} \;
find editor -name \*.o -exec rm {} \;
find navigate -name \*.o -exec rm {} \;
find agg -name \*.o -exec rm {} \;
find ssd -name \*.o -exec rm {} \;
find Realtime -name \*.o -exec rm {} \;
find websvc_trans -name \*.o -exec rm {} \;
find address_search -name \*.o -exec rm {} \;

cleanone:
rm -f *.o *.a *.da
Expand Down Expand Up @@ -370,8 +433,8 @@ libroadmap.a: $(RMLIBOBJS)
$(AR) $(ARFLAGS) libroadmap.a $(RMLIBOBJS)
$(RANLIB) libroadmap.a

libguiroadmap.a: $(RMGUIOBJS) $(RMPLUGINOBJS) $(RTOBJS)
$(AR) $(ARFLAGS) libguiroadmap.a $(RMGUIOBJS) $(RMPLUGINOBJS) $(RTOBJS)
libguiroadmap.a: $(RMGUIOBJS) $(RMPLUGINOBJS) $(RTOBJS) $(WEBSVCOBJS)
$(AR) $(ARFLAGS) libguiroadmap.a $(RMGUIOBJS) $(RMPLUGINOBJS) $(RTOBJS) $(WEBSVCOBJS)
$(RANLIB) libguiroadmap.a

unix/libosroadmap.a:
Expand Down
19 changes: 9 additions & 10 deletions Realtime/LMap_Base.h
View file
Expand Up @@ -26,20 +26,16 @@
#ifndef BYTE
typedef unsigned char BYTE;
#endif // BYTE

typedef enum tagETransactionResult
{
transaction_succeeded,
transaction_failed,
transaction_in_progress

} ETransactionResult;
//////////////////////////////////////////////////////////////////////////////////////////////////


//////////////////////////////////////////////////////////////////////////////////////////////////
#if defined (__SYMBIAN32__)
#define RT_DEVICE_ID (10)
#ifndef TOUCH_SCREEN
#define RT_DEVICE_ID (10)
#else
#define RT_DEVICE_ID (11)
#endif

#elif defined (IPHONE)
#define RT_DEVICE_ID (20)
Expand All @@ -54,9 +50,12 @@ typedef enum tagETransactionResult
#elif defined (_WIN32)
#define RT_DEVICE_ID (40)

#elif defined (__linux__)
#elif defined (ANDROID)
#define RT_DEVICE_ID (50)

#elif defined (__linux__)
#define RT_DEVICE_ID (90)

#else
#error UNKNOWN DEVICE
#endif
Expand Down

0 comments on commit e1f8ca4

Please sign in to comment.