Commit f787773b authored by jdelange's avatar jdelange

* make/Makefile.win32

   make/Makefile.common
   make/Makefile.am
   - Integration of win32 build

 * make/Makefile.leon.rtems_posix
   - Separate libraries to be included for LEON builds




git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/po-hi-c@4627 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent a8f5baed
......@@ -12,6 +12,7 @@ EXTRA_DIST=$(srcdir)/Makefile.common \
$(srcdir)/Makefile.linux32-xenomai-native \
$(srcdir)/Makefile.linux32-xenomai-posix \
$(srcdir)/Makefile.linux64 \
$(srcdir)/Makefile.win32 \
$(srcdir)/Makefile.x86.rtems \
$(srcdir)/Makefile.x86.rtems_posix \
$(srcdir)/Makefile.x86.linuxtaste \
......
......@@ -85,7 +85,6 @@ ifeq ($(NEED_TRANSPORT), yes)
po_hi_messages.o \
po_hi_marshallers.o \
po_hi_giop.o \
po_hi_lua.o \
po_hi_utils.o \
po_hi_types.o \
po_hi_monitor.o \
......@@ -125,7 +124,6 @@ else
po_hi_task.o \
po_hi_time.o \
po_hi_utils.o \
po_hi_lua.o \
po_hi_protected.o \
po_hi_monitor.o \
po_hi_storage.o \
......@@ -139,6 +137,11 @@ else
main.o
endif
ifeq ($(TARGET), $(filter $(TARGET), linux32 linux64 linux32-xenomai-posix linux32-xenomai-native))
PO_HI_OBJS += po_hi_lua.o
endif
ifeq ($(USE_ASN1_DEPLOYMENT), yes)
generate-asn1-deployment:
if [ ! -d ../asn-types ]; then mkdir -p ../asn-types ; fi
......@@ -288,9 +291,14 @@ $(BINARY): generate-asn1-deployment target-objects compile-po-hi $(GENERATED_OBJ
$(CC) -o $(BINARY) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS)
endif
ifeq ($(TARGET), $(filter $(TARGET), native bench linux32 linux64 linux32-xenomai-posix linux32-xenomai-native))
ifeq ($(TARGET), $(filter $(TARGET), win32 native bench linux32 linux64 linux32-xenomai-posix linux32-xenomai-native))
ifeq ($(TARGET), win32)
EXE=$(BINARY).exe
else
EXE=$(BINARY)
endif
$(BINARY): generate-asn1-deployment target-objects compile-po-hi $(USER_OBJS) $(GENERATED_OBJS) $(TARGET_OBJECTS)
$(CC) -o $(BINARY) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS)
$(CC) -o $(EXE) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS)
endif
ifeq ($(TARGET), arm.dslinux)
......
......@@ -34,10 +34,10 @@ TARGET_CFLAGS = -DRTEMS_POSIX -DLEON_RTEMS $(GCC_GENERIC_FLAGS) $
TARGET_INCLUDE = -I $(RUNTIME_PATH)/config/leon-rtems/
TARGET_LDFLAGS = -lrtemsbsp -lc -lm
EXTERNAL_OBJECTS += -L$(RUNTIME_PATH)/libs/leon/ -llua -lm
ifndef RTEMS_API
TARGET_CFLAGS += -DRTEMS48
TARGET_LDFLAGS += -L$(RUNTIME_PATH)/libs/leon-rtems4.8/ -llua -lm
endif
ifeq ($(RTEMS_API),4.8)
......@@ -46,6 +46,7 @@ endif
ifeq ($(RTEMS_API),4.11)
TARGET_CFLAGS += -DRTEMS411
TARGET_LDFLAGS += -L$(RUNTIME_PATH)/libs/leon-rtems4.11/ -llua -lm
endif
ifeq ($(RTEMS_API),4.10)
......
TARGET_CFLAGS = -D_WIN32 -D_GNU_SOURCE $(GCC_GENERIC_FLAGS) -std=c99 -m32
TARGET_LDFLAGS = -m32
SIMULINK_LDFLAGS = -lm
CC = i686-w64-mingw32-gcc
LD = i686-w64-mingw32-ld
GPROF = gprof
ifdef USE_GPROF
TARGET_LDFLAGS+=-pg
endif
target-clean:
target-objects:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment