Skip to content

Commit 0eaa111

Browse files
xengine-qytxengine-qyt
committed
fixed:ci
1 parent 122b41b commit 0eaa111

File tree

3 files changed

+46
-34
lines changed

3 files changed

+46
-34
lines changed

‎.github/workflows/msbuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
uses: microsoft/[email protected]
5454
#编译
5555
- name: Build Solution
56-
run: msbuild XEngine_Source/XEngine_StorageApp.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
56+
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
5757
#测试
5858
- name: Conditional Step for x86 Release
5959
if: matrix.configuration == 'Release' && matrix.platform == 'x86'

‎XEngine_Source/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ AUTH_CLIENT_PATH = ./AuthorizeModule_Client
1616

1717
AUTH_APP_PATH = ./XEngine_APPService/XEngine_AuthorizeService
1818

19+
ifeq ($(PLATFORM),linux)
20+
FILEEXT = so
21+
else ifeq ($(PLATFORM),mac)
22+
FILEEXT = dylib
23+
endif
24+
1925
XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so \
2026
libAuthorizeModule_CDKey.so libAuthorizeModule_Session.so libAuthorizeModule_Database.so libAuthorizeModule_Protocol.so libAuthorizeModule_Configure.so libAuthorizeModule_Help.so libAuthorizeModule_Client.so \
2127
XEngine_AuthorizeApp.exe
@@ -24,12 +30,6 @@ XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so
2430
MakeAll:$(XENGINE_MODULES)
2531

2632

27-
ifeq ($(PLATFORM),linux)
28-
FILEEXT = so
29-
else ifeq ($(PLATFORM),mac)
30-
FILEEXT = dylib
31-
endif
32-
3333
libjsoncpp.so:
3434
ifeq ($(FLAGS), InstallAll)
3535
cp $(THIRD_JSONCPP_PATH)/libjsoncpp.$(FILEEXT) ../XEngine_Release/

‎XEngine_Source/XEngine.sln‎

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,59 +11,71 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_HDRFile", "XEngine_
1111
EndProject
1212
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthorizeModule_Protocol", "AuthorizeModule_Protocol\AuthorizeModule_Protocol.vcxproj", "{6B926D00-DCD2-49E3-86A9-3230C9872E65}"
1313
ProjectSection(ProjectDependencies) = postProject
14-
{940A00A6-A944-46C1-B34F-1361AFE240E0} = {940A00A6-A944-46C1-B34F-1361AFE240E0}
14+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
1515
EndProjectSection
1616
EndProject
1717
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthorizeModule_Configure", "AuthorizeModule_Configure\AuthorizeModule_Configure.vcxproj", "{1391B739-713B-4A3A-9233-FEAB92E0566C}"
1818
ProjectSection(ProjectDependencies) = postProject
19-
{940A00A6-A944-46C1-B34F-1361AFE240E0} = {940A00A6-A944-46C1-B34F-1361AFE240E0}
19+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
2020
EndProjectSection
2121
EndProject
2222
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_APPService", "XEngine_APPService", "{2444CB54-6443-47F9-8D93-91237D0D05FB}"
2323
EndProject
2424
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthorizeModule_Session", "AuthorizeModule_Session\AuthorizeModule_Session.vcxproj", "{CB9138DF-789D-459F-AD43-4095B22A487F}"
25+
ProjectSection(ProjectDependencies) = postProject
26+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
27+
EndProjectSection
2528
EndProject
2629
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthorizeModule_Database", "AuthorizeModule_Database\AuthorizeModule_Database.vcxproj", "{5FA1874A-32F4-4176-9C23-4E22BE183660}"
2730
ProjectSection(ProjectDependencies) = postProject
2831
{02A75BD0-416E-4AEF-BF34-BD85BD86384F} = {02A75BD0-416E-4AEF-BF34-BD85BD86384F}
32+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
2933
EndProjectSection
3034
EndProject
3135
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_AuthorizeService", "XEngine_APPService\XEngine_AuthorizeService\XEngine_AuthorizeService.vcxproj", "{A29DFD8D-2818-4BE3-A2DB-07F241B4BFC9}"
3236
ProjectSection(ProjectDependencies) = postProject
3337
{02A75BD0-416E-4AEF-BF34-BD85BD86384F} = {02A75BD0-416E-4AEF-BF34-BD85BD86384F}
3438
{1391B739-713B-4A3A-9233-FEAB92E0566C} = {1391B739-713B-4A3A-9233-FEAB92E0566C}
35-
{185975A2-EB43-45DF-8108-03656A2BFE33} = {185975A2-EB43-45DF-8108-03656A2BFE33}
3639
{5FA1874A-32F4-4176-9C23-4E22BE183660} = {5FA1874A-32F4-4176-9C23-4E22BE183660}
3740
{6B926D00-DCD2-49E3-86A9-3230C9872E65} = {6B926D00-DCD2-49E3-86A9-3230C9872E65}
38-
{940A00A6-A944-46C1-B34F-1361AFE240E0} = {940A00A6-A944-46C1-B34F-1361AFE240E0}
3941
{AB3DB24C-E1B3-41CF-B2F4-6C12E13C2894} = {AB3DB24C-E1B3-41CF-B2F4-6C12E13C2894}
4042
{CB9138DF-789D-459F-AD43-4095B22A487F} = {CB9138DF-789D-459F-AD43-4095B22A487F}
4143
{DD8CB5F1-980F-48C3-BA2F-3CF534903B14} = {DD8CB5F1-980F-48C3-BA2F-3CF534903B14}
44+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
45+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}
4246
EndProjectSection
4347
EndProject
4448
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_AuthorizeApp", "XEngine_APPService\XEngine_AuthorizeApp\XEngine_AuthorizeApp.vcxproj", "{51DCBDC7-50CB-4A44-B10B-FCF90309914D}"
4549
ProjectSection(ProjectDependencies) = postProject
50+
{02A75BD0-416E-4AEF-BF34-BD85BD86384F} = {02A75BD0-416E-4AEF-BF34-BD85BD86384F}
4651
{1391B739-713B-4A3A-9233-FEAB92E0566C} = {1391B739-713B-4A3A-9233-FEAB92E0566C}
47-
{940A00A6-A944-46C1-B34F-1361AFE240E0} = {940A00A6-A944-46C1-B34F-1361AFE240E0}
52+
{AB3DB24C-E1B3-41CF-B2F4-6C12E13C2894} = {AB3DB24C-E1B3-41CF-B2F4-6C12E13C2894}
53+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
4854
EndProjectSection
4955
EndProject
5056
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthorizeModule_Help", "AuthorizeModule_Help\AuthorizeModule_Help.vcxproj", "{AB3DB24C-E1B3-41CF-B2F4-6C12E13C2894}"
57+
ProjectSection(ProjectDependencies) = postProject
58+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
59+
EndProjectSection
5160
EndProject
5261
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthorizeModule_Client", "AuthorizeModule_Client\AuthorizeModule_Client.vcxproj", "{DD8CB5F1-980F-48C3-BA2F-3CF534903B14}"
5362
ProjectSection(ProjectDependencies) = postProject
54-
{940A00A6-A944-46C1-B34F-1361AFE240E0} = {940A00A6-A944-46C1-B34F-1361AFE240E0}
63+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
5564
EndProjectSection
5665
EndProject
5766
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_Depend", "XEngine_Depend", "{6444F125-63DE-4120-98B3-DF097A9758FA}"
5867
EndProject
59-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsoncpp", "XEngine_Depend\XEngine_Module\jsoncpp\jsoncpp.vcxproj", "{940A00A6-A944-46C1-B34F-1361AFE240E0}"
68+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsoncpp", "XEngine_Depend\XEngine_Module\jsoncpp\jsoncpp.vcxproj", "{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}"
6069
EndProject
61-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_InfoReport", "XEngine_Depend\XEngine_Module\XEngine_InfoReport\XEngine_InfoReport.vcxproj", "{185975A2-EB43-45DF-8108-03656A2BFE33}"
70+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_InfoReport", "XEngine_Depend\XEngine_Module\XEngine_InfoReport\XEngine_InfoReport.vcxproj", "{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}"
6271
ProjectSection(ProjectDependencies) = postProject
63-
{940A00A6-A944-46C1-B34F-1361AFE240E0} = {940A00A6-A944-46C1-B34F-1361AFE240E0}
72+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
6473
EndProjectSection
6574
EndProject
6675
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthorizeModule_CDKey", "AuthorizeModule_CDKey\AuthorizeModule_CDKey.vcxproj", "{02A75BD0-416E-4AEF-BF34-BD85BD86384F}"
76+
ProjectSection(ProjectDependencies) = postProject
77+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
78+
EndProjectSection
6779
EndProject
6880
Global
6981
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -137,22 +149,22 @@ Global
137149
{DD8CB5F1-980F-48C3-BA2F-3CF534903B14}.Release|x64.Build.0 = Release|x64
138150
{DD8CB5F1-980F-48C3-BA2F-3CF534903B14}.Release|x86.ActiveCfg = Release|Win32
139151
{DD8CB5F1-980F-48C3-BA2F-3CF534903B14}.Release|x86.Build.0 = Release|Win32
140-
{940A00A6-A944-46C1-B34F-1361AFE240E0}.Debug|x64.ActiveCfg = Debug|x64
141-
{940A00A6-A944-46C1-B34F-1361AFE240E0}.Debug|x64.Build.0 = Debug|x64
142-
{940A00A6-A944-46C1-B34F-1361AFE240E0}.Debug|x86.ActiveCfg = Debug|Win32
143-
{940A00A6-A944-46C1-B34F-1361AFE240E0}.Debug|x86.Build.0 = Debug|Win32
144-
{940A00A6-A944-46C1-B34F-1361AFE240E0}.Release|x64.ActiveCfg = Release|x64
145-
{940A00A6-A944-46C1-B34F-1361AFE240E0}.Release|x64.Build.0 = Release|x64
146-
{940A00A6-A944-46C1-B34F-1361AFE240E0}.Release|x86.ActiveCfg = Release|Win32
147-
{940A00A6-A944-46C1-B34F-1361AFE240E0}.Release|x86.Build.0 = Release|Win32
148-
{185975A2-EB43-45DF-8108-03656A2BFE33}.Debug|x64.ActiveCfg = Debug|x64
149-
{185975A2-EB43-45DF-8108-03656A2BFE33}.Debug|x64.Build.0 = Debug|x64
150-
{185975A2-EB43-45DF-8108-03656A2BFE33}.Debug|x86.ActiveCfg = Debug|Win32
151-
{185975A2-EB43-45DF-8108-03656A2BFE33}.Debug|x86.Build.0 = Debug|Win32
152-
{185975A2-EB43-45DF-8108-03656A2BFE33}.Release|x64.ActiveCfg = Release|x64
153-
{185975A2-EB43-45DF-8108-03656A2BFE33}.Release|x64.Build.0 = Release|x64
154-
{185975A2-EB43-45DF-8108-03656A2BFE33}.Release|x86.ActiveCfg = Release|Win32
155-
{185975A2-EB43-45DF-8108-03656A2BFE33}.Release|x86.Build.0 = Release|Win32
152+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x64.ActiveCfg = Debug|x64
153+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x64.Build.0 = Debug|x64
154+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x86.ActiveCfg = Debug|Win32
155+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x86.Build.0 = Debug|Win32
156+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x64.ActiveCfg = Release|x64
157+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x64.Build.0 = Release|x64
158+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x86.ActiveCfg = Release|Win32
159+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x86.Build.0 = Release|Win32
160+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x64.ActiveCfg = Debug|x64
161+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x64.Build.0 = Debug|x64
162+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x86.ActiveCfg = Debug|Win32
163+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x86.Build.0 = Debug|Win32
164+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x64.ActiveCfg = Release|x64
165+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x64.Build.0 = Release|x64
166+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x86.ActiveCfg = Release|Win32
167+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x86.Build.0 = Release|Win32
156168
{02A75BD0-416E-4AEF-BF34-BD85BD86384F}.Debug|x64.ActiveCfg = Debug|x64
157169
{02A75BD0-416E-4AEF-BF34-BD85BD86384F}.Debug|x64.Build.0 = Debug|x64
158170
{02A75BD0-416E-4AEF-BF34-BD85BD86384F}.Debug|x86.ActiveCfg = Debug|Win32
@@ -168,8 +180,8 @@ Global
168180
GlobalSection(NestedProjects) = preSolution
169181
{A29DFD8D-2818-4BE3-A2DB-07F241B4BFC9} = {2444CB54-6443-47F9-8D93-91237D0D05FB}
170182
{51DCBDC7-50CB-4A44-B10B-FCF90309914D} = {2444CB54-6443-47F9-8D93-91237D0D05FB}
171-
{940A00A6-A944-46C1-B34F-1361AFE240E0} = {6444F125-63DE-4120-98B3-DF097A9758FA}
172-
{185975A2-EB43-45DF-8108-03656A2BFE33} = {6444F125-63DE-4120-98B3-DF097A9758FA}
183+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {6444F125-63DE-4120-98B3-DF097A9758FA}
184+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {6444F125-63DE-4120-98B3-DF097A9758FA}
173185
EndGlobalSection
174186
GlobalSection(ExtensibilityGlobals) = postSolution
175187
SolutionGuid = {E1F1DDE3-8949-41AF-84D6-03CB7CAA03AB}

0 commit comments

Comments
 (0)