Pantyhose-X/freeminer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move submodules -> src/external

Browse Source
This commit is contained in:
proller 2016-09-22 16:25:25 +03:00
parent c6df1b39d2
commit 7f8e82dc7d
12 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitmodules vendored
View File

@ -1,18 +1,18 @@
[submodule "games/default"]
path = games/default
url = https://github.com/freeminer/default.git
[submodule "src/enet"]
path = src/enet
[submodule "src/external/enet"]
path = src/external/enet
url = https://github.com/freeminer/enet.git
[submodule "build/osx/releases/dylibbundler"]
path = build/osx/releases/dylibbundler
url = https://github.com/auriamg/macdylibbundler.git
[submodule "src/msgpack-c"]
path = src/msgpack-c
url = https://github.com/msgpack/msgpack-c.git
[submodule "src/jsoncpp"]
path = src/jsoncpp
[submodule "src/external/jsoncpp"]
path = src/external/jsoncpp
url = https://github.com/open-source-parsers/jsoncpp.git
[submodule "games/pixture"]
path = games/pixture
url = https://github.com/kaadmy/pixture.git
[submodule "external/src/msgpack-c"]
path = external/src/msgpack-c
url = https://github.com/msgpack/msgpack-c.git

2
build/android_fm/Makefile
View File

@ -921,7 +921,7 @@ $(MSGPACK_TIMESTAMP) : msgpack_download
msgpack_download :
@if [ ! -d ${MSGPACK_DIR} ] ; then \
cp -r ${ROOT}/../../src/msgpack-c ${MSGPACK_DIR}; \
cp -r ${ROOT}/../../src/external/msgpack-c ${MSGPACK_DIR}; \
fi
msgpack_download_old :

16
build/android_fm/jni/Android.mk
View File

@ -82,8 +82,8 @@ LOCAL_MODULE := usrsctplib
LOCAL_CFLAGS += -DUSE_SCTP=1 -DINET -DINET6
#-DSCTP_WITH_NO_CSUM
LOCAL_CFLAGS += -DSCTP_SIMPLE_ALLOCATOR -DSCTP_PROCESS_LEVEL_LOCKS -D__Userspace__ -D__Userspace_os_Linux
LOCAL_C_INCLUDES := jni/src/network/usrsctp/usrsctplib
LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/network/usrsctp/usrsctplib/*.c) $(wildcard $(LOCAL_PATH)/jni/src/network/usrsctp/usrsctplib/netinet/*.c) $(wildcard $(LOCAL_PATH)/jni/src/network/usrsctp/usrsctplib/netinet6/*.c)
LOCAL_C_INCLUDES := jni/src/network/external/usrsctplib
LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/external/usrsctp/usrsctplib/*.c) $(wildcard $(LOCAL_PATH)/jni/src/external/usrsctp/usrsctplib/netinet/*.c) $(wildcard $(LOCAL_PATH)/jni/src/external/usrsctp/usrsctplib/netinet6/*.c)
LOCAL_C_INCLUDES += jni/android-ifaddrs
LOCAL_SRC_FILES += jni/android-ifaddrs/ifaddrs.c
include $(BUILD_STATIC_LIBRARY)
@ -92,16 +92,16 @@ ifeq ($(USE_ENET), 1)
include $(CLEAR_VARS)
LOCAL_CFLAGS := -DHAS_INET_PTON=1 -DHAS_INET_NTOP=1 -DHAS_GETHOSTBYNAME_R=1 -DHAS_GETADDRINFO=1 -DHAS_GETNAMEINFO=1 -DHAS_FCNTL=1 -DHAS_POLL=1 -DHAS_MSGHDR_FLAGS=1 -DHAS_SOCKLEN_T=1
LOCAL_MODULE := enet
LOCAL_C_INCLUDES := jni/src/enet/include
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/src/enet/*.c)
LOCAL_C_INCLUDES := jni/src/external/enet/include
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/src/external/enet/*.c)
include $(BUILD_STATIC_LIBRARY)
endif
endif
include $(CLEAR_VARS)
LOCAL_MODULE := jsoncpp
LOCAL_C_INCLUDES := jni/src/jsoncpp/include
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/src/jsoncpp/src/lib_json/*.cpp)
LOCAL_C_INCLUDES := jni/src/external/jsoncpp/include
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/src/external/jsoncpp/src/lib_json/*.cpp)
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
@ -465,11 +465,11 @@ LOCAL_STATIC_LIBRARIES += msgpack jsoncpp gettext
ifeq ($(USE_SCTP), 1)
LOCAL_CFLAGS += -DUSE_SCTP=1 -DINET -DINET6 -DSCTP_WITH_NO_CSUM
LOCAL_CFLAGS += -DSCTP_SIMPLE_ALLOCATOR -DSCTP_PROCESS_LEVEL_LOCKS -D__Userspace__ -D__Userspace_os_Linux
LOCAL_C_INCLUDES += jni/src/network/usrsctp/usrsctplib
LOCAL_C_INCLUDES += jni/src/external/usrsctp/usrsctplib
LOCAL_STATIC_LIBRARIES += usrsctplib
else
ifeq ($(USE_ENET), 1)
LOCAL_C_INCLUDES += jni/src/enet/include
LOCAL_C_INCLUDES += jni/src/external/enet/include
LOCAL_STATIC_LIBRARIES += enet
else
LOCAL_CFLAGS += -DMINETEST_PROTO=1

6
build/windows/build.py
View File

@ -385,9 +385,9 @@ def main():
patch(os.path.join("src", "freeminer.vcxproj"), "</AdditionalLibraryDirectories>", r";$(DXSDK_DIR)\Lib\x86</AdditionalLibraryDirectories>")
#patch(os.path.join("src", "sqlite", "sqlite3.vcxproj"), "MultiThreadedDebugDLL", "MultiThreadedDebug")
# wtf, cmake?
if os.path.exists(os.path.join("src", "enet", "enet.vcxproj")):
patch(os.path.join("src", "enet", "enet.vcxproj"), "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>")
patch(os.path.join("src", "enet", "enet.vcxproj"), "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>")
if os.path.exists(os.path.join("src", "external", "enet", "enet.vcxproj")):
patch(os.path.join("src", "external", "enet", "enet.vcxproj"), "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>")
patch(os.path.join("src", "external", "enet", "enet.vcxproj"), "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>")
if os.path.exists(os.path.join("src", "network", "usrsctp", "usrsctplib", "usrsctp.vcxproj")):
patch(os.path.join("src", "network", "usrsctp", "usrsctplib", "usrsctp.vcxproj"), "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>")

12
build/windows_vs2015/build.py
View File

@ -427,13 +427,13 @@ def main():
patch(os.path.join("src", "freeminer.vcxproj"), "</AdditionalLibraryDirectories>", r";$(DXSDK_DIR)\Lib\{}</AdditionalLibraryDirectories>".format(msbuild_platform))
#patch(os.path.join("src", "sqlite", "sqlite3.vcxproj"), "MultiThreadedDebugDLL", "MultiThreadedDebug")
# wtf, cmake?
if os.path.exists(os.path.join("src", "enet", "enet.vcxproj")):
patch(os.path.join("src", "enet", "enet.vcxproj"), "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>")
patch(os.path.join("src", "enet", "enet.vcxproj"), "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>")
if os.path.exists(os.path.join("src", "external", "enet", "enet.vcxproj")):
patch(os.path.join("src", "external", "enet", "enet.vcxproj"), "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>")
patch(os.path.join("src", "external", "enet", "enet.vcxproj"), "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>")
if os.path.exists(os.path.join("src", "network", "usrsctp", "usrsctplib", "usrsctp.vcxproj")):
patch(os.path.join("src", "network", "usrsctp", "usrsctplib", "usrsctp.vcxproj"), "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>")
patch(os.path.join("src", "network", "usrsctp", "usrsctplib", "usrsctp.vcxproj"), "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>")
patch(os.path.join("src", "external", "usrsctp", "usrsctplib", "usrsctp.vcxproj"), "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>")
patch(os.path.join("src", "external", "usrsctp", "usrsctplib", "usrsctp.vcxproj"), "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>", "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>")
# patch project file to use these packages
@ -453,7 +453,7 @@ def main():
#if build_type == "Debug":
patch(os.path.join("src", "freeminer.vcxproj"), '<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>', '<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>')
patch(os.path.join("src", "jsoncpp", "src","lib_json","jsoncpp_lib_static.vcxproj"), '<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>', '<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>')
patch(os.path.join("src", "external", "jsoncpp", "src","lib_json","jsoncpp_lib_static.vcxproj"), '<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>', '<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>')
patch(os.path.join("src","cguittfont","cguittfont.vcxproj"), '<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>', '<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>')
os.system("MSBuild ALL_BUILD.vcxproj /p:Configuration={}".format(build_type))

6
cmake/Modules/FindJson.cmake
View File

@ -23,11 +23,11 @@ if(NOT JSONCPP_FOUND)
option(JSONCPP_WITH_TESTS OFF)
option(JSONCPP_WITH_POST_BUILD_UNITTEST OFF)
option(JSONCPP_WITH_WARNING_AS_ERROR OFF)
add_subdirectory(jsoncpp)
add_subdirectory(external/jsoncpp)
message(STATUS "Using bundled JSONCPP library. ${jsoncpp_BINARY_DIR}")
set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp/include)
set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/external/jsoncpp/include)
set(JSON_LIBRARY jsoncpp_lib_static)
#set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp)
#set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/external/jsoncpp)
#set(JSON_LIBRARY jsoncpp)
#add_subdirectory(jsoncpp/json)
endif()

6
cmake/Modules/FindMsgPack.cmake
View File

@ -53,9 +53,9 @@ elseif(NOT MSGPACK_LIBRARY)
if(MSVC)
set(MSGPACK_ENABLE_SHARED OFF)
endif()
add_subdirectory(msgpack-c)
#include_directories(${PROJECT_SOURCE_DIR}/msgpack-c/include)
add_subdirectory(external/msgpack-c)
#include_directories(${PROJECT_SOURCE_DIR}/external/msgpack-c/include)
set(MSGPACK_LIBRARY msgpackc-static) # before 1.4.0 was msgpack-static
set(MSGPACK_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/msgpack-c/include)
set(MSGPACK_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/external/msgpack-c/include)
message(STATUS "Using bundled msgpack ${MSGPACK_INCLUDE_DIR} ${MSGPACK_LIBRARY}")
endif()

1
external/src/msgpack-c vendored Submodule

@ -0,0 +1 @@
Subproject commit 87ff7e4ccc978435d8ecc15bf6ece86774a6ebed

4
src/CMakeLists.txt
View File

@ -708,8 +708,8 @@ else()
endif()
if(USE_ENET)
add_subdirectory(enet)
include_directories(${PROJECT_SOURCE_DIR}/enet/include)
add_subdirectory(external/enet)
include_directories(${PROJECT_SOURCE_DIR}/external/enet/include)
set(ENET_LIBRARY enet)
endif()

0
src/enet → src/external/enet vendored
View File

0
src/jsoncpp → src/external/jsoncpp vendored
View File

1
src/msgpack-c

@ -1 +0,0 @@
Subproject commit 42181289ed9c12fbf70ed3f1320c7ef9a4f76836