fix building for openwrt

spacemeowx2 · Jan 21, 2019 · 8ee926a · 8ee926a
1 parent eda2c4d
commit 8ee926a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,4 @@
 build/
 server/
+build-*/
+.vs/
diff --git a/docker/Dockerfile.openwrt b/docker/Dockerfile.openwrt
@@ -17,9 +17,8 @@ RUN curl -o /tmp/${NAME} ${SDK_URL} \
 
 RUN apk add --no-cache perl make git bash gawk gcc g++ ncurses-dev
 WORKDIR ${SDK_PATH}
-RUN git config –-global http.postBuffer 524288000 \
-    && ./scripts/feeds update base packages
-RUN ./scripts/feeds install libpcap libuv
+RUN ./scripts/feeds update base
+RUN ./scripts/feeds install libpcap
 
 RUN mkdir ./package/switch-lan-play
 COPY ./docker/Makefile.openwrt ${SDK_PATH}/package/switch-lan-play/Makefile

diff --git a/docker/Makefile.openwrt b/docker/Makefile.openwrt
@@ -8,11 +8,13 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
+CMAKE_BINARY_SUBDIR := build-openwrt
+
 define Package/$(PKG_NAME)
 	SECTION:=net
 	CATEGORY:=Network
 	SUBMENU:=Lan-play
-	DEPENDS:=+libpcap +libuv +libpthread
+	DEPENDS:=+libpcap +libpthread
 	TITLE:=Switch Lan Play Client
 endef
 
@@ -27,7 +29,7 @@ endef
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lan-play $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/build-openwrt/src/lan-play $(1)/usr/bin
 endef
 
 define Package/$(PKG_NAME)/postinst