Skip to content

Commit d3e6847

Browse files
committed
modify:re-add sub module
1 parent 4ba6a82 commit d3e6847

File tree

14 files changed

+124
-143
lines changed

14 files changed

+124
-143
lines changed

.gitmodules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[submodule "XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource"]
2+
path = XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource
3+
url = https://github.com/libxengine/XEngine_OPenSource.git
4+
[submodule "XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData"]
5+
path = XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData
6+
url = https://github.com/libxengine/XEngine_IPMacData.git
7+
[submodule "XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData"]
8+
path = XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData
9+
url = https://github.com/libxengine/XEngine_PhoneData.git

XEngine_Source/XEngine.sln

Lines changed: 60 additions & 91 deletions
Large diffs are not rendered by default.
Submodule XEngine_IPMacData added at a6449e7
Submodule XEngine_OPenSource added at 7a6b18a
Submodule XEngine_PhoneData added at 2ffa9e3

XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,30 +99,30 @@
9999
<PropertyGroup Label="UserMacros" />
100100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
101101
<LinkIncremental>true</LinkIncremental>
102-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;..\XEngine_ModuleConfigure;$(IncludePath)</IncludePath>
102+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;..\XEngine_ModuleConfigure;$(IncludePath)</IncludePath>
103103
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
104104
</PropertyGroup>
105105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
106106
<LinkIncremental>false</LinkIncremental>
107-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
107+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
108108
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
109109
</PropertyGroup>
110110
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
111111
<LinkIncremental>true</LinkIncremental>
112-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
112+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
113113
</PropertyGroup>
114114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
115115
<LinkIncremental>true</LinkIncremental>
116-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
116+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
117117
</PropertyGroup>
118118
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
119119
<LinkIncremental>false</LinkIncremental>
120-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
120+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
121121
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
122122
</PropertyGroup>
123123
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
124124
<LinkIncremental>false</LinkIncremental>
125-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
125+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
126126
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
127127
</PropertyGroup>
128128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,32 +99,32 @@
9999
<PropertyGroup Label="UserMacros" />
100100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
101101
<LinkIncremental>true</LinkIncremental>
102-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;..\XEngine_ModuleProtocol;$(IncludePath)</IncludePath>
102+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;..\XEngine_ModuleProtocol;$(IncludePath)</IncludePath>
103103
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
104104
</PropertyGroup>
105105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
106106
<LinkIncremental>false</LinkIncremental>
107-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
107+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
108108
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
109109
</PropertyGroup>
110110
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
111111
<LinkIncremental>true</LinkIncremental>
112-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
112+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
113113
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
114114
</PropertyGroup>
115115
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
116116
<LinkIncremental>true</LinkIncremental>
117-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
117+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
118118
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
119119
</PropertyGroup>
120120
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
121121
<LinkIncremental>false</LinkIncremental>
122-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
122+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
123123
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
124124
</PropertyGroup>
125125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
126126
<LinkIncremental>false</LinkIncremental>
127-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
127+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
128128
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
129129
</PropertyGroup>
130130
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

XEngine_Source/XEngine_ModuleProtocol/pch.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#include <XEngine_Include/XEngine_AVCodec/AVCollect_Define.h>
3838
#include <XEngine_Include/XEngine_AVCodec/VideoCodec_Define.h>
3939
#include <XEngine_Include/XEngine_AVCodec/AVHelp_Define.h>
40-
#include "../../../XEngine_DBDepend/XEngine_IPMacData/XEngine_Source/XIPMac_CommHdr.h"
41-
#include "../../../XEngine_DBDepend/XEngine_PhoneData/Source/XPhone_CommHdr.h"
40+
#include "../../../XEngine_DependLibrary/XEngine_IPMacData/XEngine_Source/XIPMac_CommHdr.h"
41+
#include "../../../XEngine_DependLibrary/XEngine_PhoneData/Source/XPhone_CommHdr.h"
4242
using namespace std;
4343
#include "../XEngine_UserProtocol.h"
4444
#include "ModuleProtocol_Define.h"

XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/ModulePlugin_BMIndex.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,37 +100,37 @@
100100
<PropertyGroup Label="UserMacros" />
101101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
102102
<OutDir>$(SolutionDir)$(Configuration)\XEngine_LibPlugin\</OutDir>
103-
<IncludePath>../../XEngine_Depend/XEngine_Module/jsoncpp;$(XEngine_Include);$(IncludePath)</IncludePath>
103+
<IncludePath>../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(XEngine_Include);$(IncludePath)</IncludePath>
104104
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
105105
<IntDir>$(Configuration)\XEngine_LibPlugin\</IntDir>
106106
<TargetName>$(ProjectName)</TargetName>
107107
</PropertyGroup>
108108
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
109-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
109+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
110110
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
111111
<OutDir>$(SolutionDir)$(Configuration)\XEngine_LibPlugin\</OutDir>
112112
<IntDir>$(Configuration)\XEngine_LibPlugin\</IntDir>
113113
</PropertyGroup>
114114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
115-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
115+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
116116
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
117117
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\XEngine_LibPlugin\</OutDir>
118118
<IntDir>$(Platform)\$(Configuration)\XEngine_LibPlugin\</IntDir>
119119
</PropertyGroup>
120120
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
121-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
121+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
122122
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
123123
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\XEngine_LibPlugin\</OutDir>
124124
<IntDir>$(Platform)\$(Configuration)\XEngine_LibPlugin\</IntDir>
125125
</PropertyGroup>
126126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
127-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
127+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
128128
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
129129
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\XEngine_LibPlugin\</OutDir>
130130
<IntDir>$(Platform)\$(Configuration)\XEngine_LibPlugin\</IntDir>
131131
</PropertyGroup>
132132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
133-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
133+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
134134
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
135135
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\XEngine_LibPlugin\</OutDir>
136136
<IntDir>$(Platform)\$(Configuration)\XEngine_LibPlugin\</IntDir>

XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/ModulePlugin_Meter.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,37 +101,37 @@
101101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
102102
<OutDir>$(SolutionDir)$(Configuration)\XEngine_LibPlugin\</OutDir>
103103
<IntDir>$(Configuration)\XEngine_LibPlugin\</IntDir>
104-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
104+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
105105
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
106106
</PropertyGroup>
107107
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
108108
<OutDir>$(SolutionDir)$(Configuration)\XEngine_LibPlugin\</OutDir>
109109
<IntDir>$(Configuration)\XEngine_LibPlugin\</IntDir>
110-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
110+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
111111
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
112112
</PropertyGroup>
113113
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
114114
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\XEngine_LibPlugin\</OutDir>
115115
<IntDir>$(Platform)\$(Configuration)\XEngine_LibPlugin\</IntDir>
116-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
116+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
117117
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
118118
</PropertyGroup>
119119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
120120
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\XEngine_LibPlugin\</OutDir>
121121
<IntDir>$(Platform)\$(Configuration)\XEngine_LibPlugin\</IntDir>
122-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
122+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
123123
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
124124
</PropertyGroup>
125125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
126126
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\XEngine_LibPlugin\</OutDir>
127127
<IntDir>$(Platform)\$(Configuration)\XEngine_LibPlugin\</IntDir>
128-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
128+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
129129
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
130130
</PropertyGroup>
131131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
132132
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\XEngine_LibPlugin\</OutDir>
133133
<IntDir>$(Platform)\$(Configuration)\XEngine_LibPlugin\</IntDir>
134-
<IncludePath>$(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
134+
<IncludePath>$(XEngine_Include);../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
135135
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
136136
</PropertyGroup>
137137
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

0 commit comments

Comments
 (0)