oxen-io
/
lokinet
mirror of https://github.com/oxen-io/lokinet
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

manually merge #859

This commit is contained in:
Rick V 2019-10-30 15:44:27 -05:00
parent e9b4053bac
commit 83c5e9ace4
No known key found for this signature in database
GPG Key ID: C0EDC8723FDC3465
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -238,7 +238,7 @@ windows-debug-configure: clean
windows-debug: windows-debug-configure
$(MAKE) -C '$(BUILD_ROOT)'
cp '$(BUILD_ROOT)/lokinet.exe' '$(REPO)/lokinet.exe'
cp '$(BUILD_ROOT)/daemon/lokinet.exe' '$(REPO)/lokinet.exe'
windows-release-configure: clean
mkdir -p '$(BUILD_ROOT)'
@ -246,7 +246,7 @@ windows-release-configure: clean
windows-release: windows-release-configure
$(MAKE) -C '$(BUILD_ROOT)'
cp '$(BUILD_ROOT)/lokinet.exe' '$(REPO)/lokinet.exe'
cp '$(BUILD_ROOT)/daemon/lokinet.exe' '$(REPO)/lokinet.exe'
windows: windows-debug

4
daemon/CMakeLists.txt
View File

@ -15,8 +15,8 @@ if(SHADOW)
target_include_directories(${LOKINET_SHADOW} PUBLIC ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/llarp ${PROJECT_SOURCE_DIR}/crypto/include)
else()
if(WIN32 AND NOT MSVC_VERSION)
list(APPEND ${EXE_SRC} llarp/win32/version.rc)
list(APPEND ${CTL_SRC} llarp/win32/version.rc)
list(APPEND ${EXE_SRC} ../llarp/win32/version.rc)
list(APPEND ${CTL_SRC} ../llarp/win32/version.rc)
endif()
add_executable(${EXE} ${EXE_SRC})