update windows makefile

Author: johnnycubides

.gitignore

@@ -5,6 +5,7 @@ build-app/
 bin/
 *.o
 *.so*
+*.dll
 *.a
 *.la
 pkgconfig

Makefile

@@ -1,12 +1,26 @@
+lua-download:
+	@echo "Descarga de lua"
+	bash ./scripts/lua.bash download
 
 lua-linux:
-	@echo "Descarga compilación o crosscompilación de Lua"
-	bash ./scripts/lua.bash download
+	@echo "Compilación o crosscompilación de Lua"
 	bash ./scripts/lua.bash build-linux
 	bash ./scripts/lua.bash install-linux
 
-libserialport-linux:
-	@echo "Descargar y crear librería libserialport"
+lua-windows:
+	@echo "Compilación o crosscompilación de Lua"
+	bash ./scripts/lua.bash build-windows
+
+libserialport-download:
+	@echo "Descargar la librería libserialpor"
 	bash ./scripts/libserialport.bash download
+
+libserialport-linux:
+	@echo "Compilar la librería para Linux"
+	# bash ./scripts/libserialport.bash dependencies-linux
 	bash ./scripts/libserialport.bash build-linux
 
+libserialport-windows:
+	@echo "Cross compilar la librería para Windows"
+	# bash ./scripts/libserialport.bash dependencies-windows
+	bash ./scripts/libserialport.bash build-windows

README.md

@@ -29,7 +29,14 @@ make test
 
 ### Plataforma Windows
 
-TODO: Requiere crear los scripts
+TODO: Scripts aún en prueba
+
+```
+make libserialport-windows lua-windows
+cd src/
+make all AR=w64
+
+```
 
 
 ### Importación de librería

scripts/libserialport.bash

@@ -5,13 +5,21 @@ SCRIPT_PATH=$(pwd)
 BUILDER_PATH=$SCRIPT_PATH/build-app
 DIR_APP=$BUILDER_PATH/$APP
 
-dependencies() {
+dependencies-linux() {
 	sudo apt update
 	sudo apt install \
 		libtool \
 		-y
 }
 
+dependencies-windows() {
+	sudo apt update
+	sudo apt install \
+		libtool \
+		mingw-w64 \
+		-y
+}
+
 download() {
 	mkdir -p $BUILDER_PATH
 	cd $BUILDER_PATH
@@ -21,7 +29,7 @@ download() {
 
 build-linux() {
 	cd $DIR_APP
-	dependencies
+	make clean
 	./autogen.sh
 	# ./configure
 	./configure --prefix=$(pwd)/../../src/
@@ -31,6 +39,20 @@ build-linux() {
 	ls -ltrh .libs/
 }
 
+build-windows() {
+	cd $DIR_APP
+	make clean
+	./autogen.sh
+	# Configuración para windows 64 bits
+	./configure --prefix=$(pwd)/../../src/ --host=x86_64-w64-mingw32
+	# Configuración para windows de 32 bits
+	# ./configure --prefix=$(pwd)/../../src/ --host=i686-w64-mingw32
+	make
+	make install
+	echo "ls -ltrh .libs/"
+	ls -ltrh .libs/
+}
+
 if [[ -v 1 ]]; then
 	$1
 fi

scripts/lua.bash

@@ -23,7 +23,9 @@ download() {
 	curl -L -R -O $DOWNLOAD_APP
 	tar xzf $APP-$VERSION.tar.gz
 	rm -f $APP-$VERSION.tar.gz
-	ln -sr $APP-$VERSION $APP
+	echo "Crear enlace simbólico de lua al src de libserial."
+	rm -rf ../src/lib/lua
+	ln -sr $APP-$VERSION/src/ ../src/lib/lua
 }
 
 build-linux() {
@@ -34,11 +36,26 @@ build-linux() {
 		dependencies
 		make linux
 	elif [[ $VERSION == "5.4.6" ]]; then
+		make clean
 		make all test PLATFORM=$PLATFORM
 	fi
 	cp src/lua ../../src/lua
 }
 
+build-windows() {
+	cd $DIR_APP
+	# rm -f ../../src/lib/lua
+	# ln -sr src ../../src/lib/lua
+	if [[ $VERSION == "5.2.4" ]]; then
+		dependencies
+		make linux
+	elif [[ $VERSION == "5.4.6" ]]; then
+		make clean
+		make CC=x86_64-w64-mingw32-gcc mingw
+	fi
+	# cp src/lua ../../src/lua
+}
+
 install-linux() {
 	mkdir -p $BIN
 	cd $DIR_APP/src

src/Makefile

@@ -1,29 +1,54 @@
-CC = gcc -v
 CFLAGS = -O2 -fPIC
+INCLUDES = -Iinclude -Ilib/lua
 LDFLAGS = -shared
 LIBSERIALPORT_DIR =.
-INCLUDES = -Iinclude
+
+ifeq ($(AR),w64)
+CC = x86_64-w64-mingw32-gcc -v
+LIBS = -L$(LIBSERIALPORT_DIR)/lib  -L$(LIBSERIALPORT_DIR)/lib/lua -lserialport -llua
+OBJ=libserial.dll
+else	ifeq ($(AR),w32)
+CC = i686-w64-mingw32-gcc -v
+LIBS = -L$(LIBSERIALPORT_DIR)/lib -L$(LIBSERIALPORT_DIR)/lib/lua -lserialport -llua
+OBJ=libserial.dll
+else
+CC = gcc -v
 LIBS = -L$(LIBSERIALPORT_DIR)/lib -lserialport
+OBJ=libserial.so
+endif
 
 f=./luatest/test.lua
 
-all: libserial.so
+h: help
+
+all: $(OBJ)
+
+libserial.dll: libserial.o
+	@echo "##> ENLAZAR"
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -Wl,-rpath,$(LIBSERIALPORT_DIR)/lib
 
 libserial.so: libserial.o
+	@echo "##> ENLAZAR"
 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -Wl,-rpath,$(LIBSERIALPORT_DIR)/lib
 
 libserial.o: libserial.c
+	@echo "##> COMPILAR"
 	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 test:
 	./lua $f
 
-dist-linux:
+dist-linux: $(OBJ)
 	rm -f libserial.zip
 	zip -r libserial.zip ./lib/libserialport.so.0 ./libserial.so
 
 clean:
-	rm -f *.o libserial.so *.zip
+	rm -f *.o libserial.dll libserial.so *.zip
+
+help:
+	@echo "make all -> Construye la librería para Linux"
+	@echo "make all AR=w64 -> Construye la librería para Windows"
+	@echo "make clean -> Borra los objetos creados"
 # Notes:
 # gcc -o libserial.so -shared -fPIC -Wall -Ilua -Llua -llua -Llibserialport/.libs -lserialport libserial.c
 # gcc -o mi_aplicacion main.c -I./libserialport -L./libserialport/.libs -lserialport -static