Commit e2e112c0 authored by Mart Lubbers's avatar Mart Lubbers
Browse files

add platformspecific sources because windows requires an extra object file

parent 06a7ec4e
Pipeline #46344 passed with stages
in 2 minutes and 26 seconds
...@@ -19,10 +19,12 @@ ifeq ($(OS), Windows_NT) ...@@ -19,10 +19,12 @@ ifeq ($(OS), Windows_NT)
cp cdeps/wolfMQTT/src/libwolfmqtt_la-mqtt_packet.o src/Clean\ System\ Files/libwolfmqtt_la-mqtt_packet.$(SUFFIX) cp cdeps/wolfMQTT/src/libwolfmqtt_la-mqtt_packet.o src/Clean\ System\ Files/libwolfmqtt_la-mqtt_packet.$(SUFFIX)
cp cdeps/wolfMQTT/src/libwolfmqtt_la-mqtt_socket.o src/Clean\ System\ Files/libwolfmqtt_la-mqtt_socket.$(SUFFIX) cp cdeps/wolfMQTT/src/libwolfmqtt_la-mqtt_socket.o src/Clean\ System\ Files/libwolfmqtt_la-mqtt_socket.$(SUFFIX)
cp cdeps/_chkstk_ms.obj src/Clean\ System\ Files/ cp cdeps/_chkstk_ms.obj src/Clean\ System\ Files/
cp src-win/* src/
else else
cp cdeps/wolfMQTT/src/.libs/libwolfmqtt_la-mqtt_client.o src/Clean\ System\ Files/libwolfmqtt_la-mqtt_client.$(SUFFIX) cp cdeps/wolfMQTT/src/.libs/libwolfmqtt_la-mqtt_client.o src/Clean\ System\ Files/libwolfmqtt_la-mqtt_client.$(SUFFIX)
cp cdeps/wolfMQTT/src/.libs/libwolfmqtt_la-mqtt_packet.o src/Clean\ System\ Files/libwolfmqtt_la-mqtt_packet.$(SUFFIX) cp cdeps/wolfMQTT/src/.libs/libwolfmqtt_la-mqtt_packet.o src/Clean\ System\ Files/libwolfmqtt_la-mqtt_packet.$(SUFFIX)
cp cdeps/wolfMQTT/src/.libs/libwolfmqtt_la-mqtt_socket.o src/Clean\ System\ Files/libwolfmqtt_la-mqtt_socket.$(SUFFIX) cp cdeps/wolfMQTT/src/.libs/libwolfmqtt_la-mqtt_socket.o src/Clean\ System\ Files/libwolfmqtt_la-mqtt_socket.$(SUFFIX)
cp src-posix/* src/
endif endif
buildDemo: buildDemo:
......
...@@ -3,12 +3,19 @@ CLEAN_HOME?=/opt/clean ...@@ -3,12 +3,19 @@ CLEAN_HOME?=/opt/clean
.SECONDARY: MQTTClient.prj .SECONDARY: MQTTClient.prj
.PHONY: clean .PHONY: clean
ifeq ($(OS), Windows_NT)
SRC:=win
else
SRC:=posix
endif
all: MQTTClient all: MQTTClient
%.prj: %.icl %.prj: %.icl
cpm project $* create $(CLEAN_HOME)/etc/iTasks.prt cpm project $* create $(CLEAN_HOME)/etc/iTasks.prt
cpm project $@ root .. cpm project $@ root ..
cpm project $@ path add ../src cpm project $@ path add ../src
cpm project $@ path add ../src-$(SRC)
%: %.prj %: %.prj
cpm project $^ build cpm project $^ build
...@@ -16,4 +23,4 @@ all: MQTTClient ...@@ -16,4 +23,4 @@ all: MQTTClient
clean: clean:
rm -rf Clean\ System\ Files rm -rf Clean\ System\ Files
rm -rf MQTTClient-www rm -rf MQTTClient-www
rm -f MQTTClient *.bc *.pbc *.prj rm -f MQTTClient *.bc *.pbc *.prj
\ No newline at end of file
definition module _MQTT
implementation module _MQTT
definition module _MQTT
implementation module _MQTT
import code from "_chkstk_ms."
...@@ -6,6 +6,8 @@ import code from "libwolfmqtt_la-mqtt_client." ...@@ -6,6 +6,8 @@ import code from "libwolfmqtt_la-mqtt_client."
import code from "libwolfmqtt_la-mqtt_packet." import code from "libwolfmqtt_la-mqtt_packet."
import code from "libwolfmqtt_la-mqtt_socket." import code from "libwolfmqtt_la-mqtt_socket."
import _MQTT
import qualified Data.Map as DM import qualified Data.Map as DM
import Data.Functor import Data.Functor
import Data.Func import Data.Func
......
Supports Markdown
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