Skip to content

Commit 025263b

Browse files
xengine-qytxengine-qyt
committed
fixed:opensource submodule dir
1 parent f7d2633 commit 025263b

File tree

8 files changed

+24
-27
lines changed

8 files changed

+24
-27
lines changed

‎XEngine_Source/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ UNICODE = 0
33
PLATFORM=linux
44
FLAGS=
55
#要编译的模块
6-
THIRDPART_MODULE_JSONCPP = ./XEngine_Depend/XEngine_Module/jsoncpp
7-
THIRDPART_MODULE_REPORT = ./XEngine_Depend/XEngine_Module/XEngine_InfoReport
6+
THIRDPART_MODULE_JSONCPP = ./XEngine_DependLibrary/XEngine_Module/jsoncpp
7+
THIRDPART_MODULE_REPORT = ./XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport
88

99
MODULE_CONFIGURE_PATH = ./XEngine_ModuleConfigure
1010
MODULE_HELP_PATH = ./XEngine_ModuleHelp

‎XEngine_Source/XEngine.sln

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_StreamMediaApp", "X
3838
EndProject
3939
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModuleQueue", "XEngine_ModuleQueue\XEngine_ModuleQueue.vcxproj", "{9FF6FA78-456E-4A7E-86B1-17E4DB5403C9}"
4040
EndProject
41-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_Depend", "XEngine_Depend", "{6A753FB6-282E-4E86-91BB-BE97618B65A4}"
41+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_DependLibrary", "XEngine_DependLibrary", "{6A753FB6-282E-4E86-91BB-BE97618B65A4}"
4242
EndProject
43-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsoncpp", "XEngine_Depend\XEngine_Module\jsoncpp\jsoncpp.vcxproj", "{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}"
43+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsoncpp", "XEngine_DependLibrary\XEngine_Module\jsoncpp\jsoncpp.vcxproj", "{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}"
4444
EndProject
45-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_InfoReport", "XEngine_Depend\XEngine_Module\XEngine_InfoReport\XEngine_InfoReport.vcxproj", "{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}"
46-
ProjectSection(ProjectDependencies) = postProject
47-
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
48-
EndProjectSection
45+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_InfoReport", "XEngine_DependLibrary\XEngine_Module\XEngine_InfoReport\XEngine_InfoReport.vcxproj", "{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}"
4946
EndProject
5047
Global
5148
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎XEngine_Source/XEngine_ModuleConfigure/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_Module/jsoncpp
77
LIB = -ljsoncpp
88
LIBEX =
99
OBJECTS = ModuleConfigure_Json.o pch.o

‎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_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_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_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_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_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_Module/jsoncpp;$(IncludePath)</IncludePath>
126126
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
127127
</PropertyGroup>
128128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎XEngine_Source/XEngine_ModuleProtocol/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_Module/jsoncpp
77
LIB = -ljsoncpp
88
LIBEX =
99
OBJECTS = ModuleProtocol_Packet.o ModuleProtocol_Parse.o pch.o

‎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;$(IncludePath)</IncludePath>
102+
<IncludePath>$(XEngine_Include);../XEngine_DependLibrary/XEngine_Module/jsoncpp;$(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_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_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_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_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_Module/jsoncpp;$(IncludePath)</IncludePath>
128128
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
129129
</PropertyGroup>
130130
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CC = g++ -Wall -std=c++20
22
PLATVER =
33
LOADHDR = -I ./
44
LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleProtocol -L ../../XEngine_ModuleSession -L ../../XEngine_ModuleHelp -L ../../XEngine_ModuleQueue \
5-
-L ../../XEngine_Depend/XEngine_Module/jsoncpp -L ../../XEngine_Depend/XEngine_Module/XEngine_InfoReport
5+
-L ../../XEngine_DependLibrary/XEngine_Module/jsoncpp -L ../../XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport
66
LIB = -lXEngine_BaseLib -lXEngine_Algorithm \
77
-lXEngine_Core -lXEngine_ManagePool -lXEngine_Cryption \
88
-lXClient_Stream \

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Hdr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ using namespace std;
7979
#include "../../XEngine_ModuleHelp/ModuleHelp_Error.h"
8080
#include "../../XEngine_ModuleQueue/ModuleQueue_Define.h"
8181
#include "../../XEngine_ModuleQueue/ModuleQueue_Error.h"
82-
#include "../../XEngine_Depend/XEngine_Module/XEngine_InfoReport/InfoReport_Define.h"
83-
#include "../../XEngine_Depend/XEngine_Module/XEngine_InfoReport/InfoReport_Error.h"
82+
#include "../../XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport/InfoReport_Define.h"
83+
#include "../../XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport/InfoReport_Error.h"
8484
//加载自己的头文件
8585
#include "XEngine_Configure.h"
8686
#include "XEngine_Network.h"

0 commit comments

Comments
 (0)