From 67aeffc5fd6573074a450826fe0c000ca2177451 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 17 Sep 2018 08:09:12 +0800 Subject: *update --- build/04Network/04Network.vcxproj.user | 4 + build/05Font/05Font.vcxproj | 134 +++++++++++++++++++++++++++++++++ build/05Font/05Font.vcxproj.filters | 22 ++++++ build/05Font/05Font.vcxproj.user | 4 + build/Debug/SDL2.dll | Bin 0 -> 996352 bytes build/libjin.sln | 27 ++++--- build/libjin/libjin.vcxproj | 27 ++----- build/libjin/libjin.vcxproj.filters | 126 ++++++------------------------- 8 files changed, 207 insertions(+), 137 deletions(-) create mode 100644 build/04Network/04Network.vcxproj.user create mode 100644 build/05Font/05Font.vcxproj create mode 100644 build/05Font/05Font.vcxproj.filters create mode 100644 build/05Font/05Font.vcxproj.user create mode 100644 build/Debug/SDL2.dll (limited to 'build') diff --git a/build/04Network/04Network.vcxproj.user b/build/04Network/04Network.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/04Network/04Network.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/build/05Font/05Font.vcxproj b/build/05Font/05Font.vcxproj new file mode 100644 index 0000000..aa5d125 --- /dev/null +++ b/build/05Font/05Font.vcxproj @@ -0,0 +1,134 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {D1953718-E728-4A86-9CCF-8BEC1F5C5F97} + My05Font + 10.0.14393.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + $(SolutionDir)..\libjin\;$(SolutionDir)\lib\SDL2-2.0.5\include\ + + + $(SolutionDir)\lib\SDL2-2.0.5\lib\x86\ + SDL2main.lib;SDL2.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + Console + + + + + Level3 + Disabled + true + + + + + Level3 + MaxSpeed + true + true + true + $(SolutionDir)..\libjin\;$(SolutionDir)\lib\SDL2-2.0.5\include\ + + + true + true + $(SolutionDir)\lib\SDL2-2.0.5\lib\x86\ + SDL2main.lib;SDL2.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + Console + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + + + + + + + + {407e9199-d39c-4460-b218-0c29ab42483b} + + + + + + \ No newline at end of file diff --git a/build/05Font/05Font.vcxproj.filters b/build/05Font/05Font.vcxproj.filters new file mode 100644 index 0000000..71e0cf9 --- /dev/null +++ b/build/05Font/05Font.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + 源文件 + + + \ No newline at end of file diff --git a/build/05Font/05Font.vcxproj.user b/build/05Font/05Font.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/05Font/05Font.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/build/Debug/SDL2.dll b/build/Debug/SDL2.dll new file mode 100644 index 0000000..c21f747 Binary files /dev/null and b/build/Debug/SDL2.dll differ diff --git a/build/libjin.sln b/build/libjin.sln index 89d9ab5..05a6517 100644 --- a/build/libjin.sln +++ b/build/libjin.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2019 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjin", "libjin\libjin.vcxproj", "{407E9199-D39C-4460-B218-0C29AB42483B}" EndProject @@ -15,7 +15,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04Network", "04Network\04Ne EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{D401F737-EEF5-4EA3-8CEA-A15523AE68AD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05Font", "05Font\05Font.vcxproj", "{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05Font", "05Font\05Font.vcxproj", "{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -65,14 +65,14 @@ Global {85071432-24B6-46D4-98D8-DAA63183093C}.Release|x64.Build.0 = Release|x64 {85071432-24B6-46D4-98D8-DAA63183093C}.Release|x86.ActiveCfg = Release|Win32 {85071432-24B6-46D4-98D8-DAA63183093C}.Release|x86.Build.0 = Release|Win32 - {82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Debug|x64.ActiveCfg = Debug|x64 - {82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Debug|x64.Build.0 = Debug|x64 - {82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Debug|x86.ActiveCfg = Debug|Win32 - {82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Debug|x86.Build.0 = Debug|Win32 - {82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Release|x64.ActiveCfg = Release|x64 - {82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Release|x64.Build.0 = Release|x64 - {82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Release|x86.ActiveCfg = Release|Win32 - {82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Release|x86.Build.0 = Release|Win32 + {D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Debug|x64.ActiveCfg = Debug|x64 + {D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Debug|x64.Build.0 = Debug|x64 + {D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Debug|x86.ActiveCfg = Debug|Win32 + {D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Debug|x86.Build.0 = Debug|Win32 + {D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Release|x64.ActiveCfg = Release|x64 + {D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Release|x64.Build.0 = Release|x64 + {D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Release|x86.ActiveCfg = Release|Win32 + {D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -82,6 +82,9 @@ Global {A2D75980-B0AC-498C-B507-4727B4A38E83} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD} {0E49D105-2032-4825-9FA1-54B1B94E3655} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD} {85071432-24B6-46D4-98D8-DAA63183093C} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD} - {82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD} + {D1953718-E728-4A86-9CCF-8BEC1F5C5F97} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {310E7948-2690-4896-9579-19E6AC4D405B} EndGlobalSection EndGlobal diff --git a/build/libjin/libjin.vcxproj b/build/libjin/libjin.vcxproj index b91de18..b1edd9e 100644 --- a/build/libjin/libjin.vcxproj +++ b/build/libjin/libjin.vcxproj @@ -37,6 +37,7 @@ + @@ -46,17 +47,12 @@ - - - - - @@ -71,6 +67,8 @@ + + @@ -78,8 +76,6 @@ - - @@ -89,6 +85,7 @@ + @@ -105,28 +102,18 @@ - + + + - - - - - - - - - - - - diff --git a/build/libjin/libjin.vcxproj.filters b/build/libjin/libjin.vcxproj.filters index 1fa6de6..1235bd3 100644 --- a/build/libjin/libjin.vcxproj.filters +++ b/build/libjin/libjin.vcxproj.filters @@ -25,9 +25,6 @@ {2277fe39-88f2-4009-94ba-80c093d01a84} - - {fe7b76de-1e3e-427f-9885-19f6d54d79e1} - {09c8db1c-dd68-4f0e-80a8-93bdb79cfd39} @@ -43,18 +40,9 @@ {d0a63eea-6b3e-488e-97f7-8d4fcf48d8ea} - - {ceca90bd-f033-4f44-a535-d44f81c1ce5e} - {27b1eb0d-f333-4ce6-9b45-1331a57ccb6b} - - {ea9c11c8-1d83-441b-a1aa-e7fb85abd615} - - - {32b0ca98-fc83-411a-8668-e65fb2ac3381} - {f1e40195-cb8e-478b-9c36-379005ff6c31} @@ -64,39 +52,6 @@ {53e06a65-a5ba-41d8-a1f6-6fb5680207ba} - - {4d34f3cf-9165-41c5-9070-10442e9fed73} - - - {fc249b2b-dbab-41f0-b507-331ce4db0899} - - - {bd893cbe-82a4-4c49-a398-a126a312d4fb} - - - {5b6076d6-40ea-4ca3-a427-77def412d945} - - - {5b1e81c7-866a-414e-a976-48aebfd57225} - - - {bbb4cecd-f074-46eb-93bb-b66e5b953da5} - - - {2b872284-f186-4f97-935d-76c0ea464791} - - - {8f32efc4-0800-4d24-b915-faee1cdb7279} - - - {5d2bf6f9-0f2a-4a25-829c-ed54ed280aa6} - - - {5de638b5-bb1a-4b71-aaee-1ca813ce3a95} - - - {84e2ae2f-5cec-4904-9611-330a0362a288} - {0de74e8c-939d-4275-a4d6-a1c075b8eeb2} @@ -162,9 +117,6 @@ Math - - Math - Net @@ -180,24 +132,12 @@ Time - - Tilemap - Common Common - - Utils\CSV - - - Utils\Json - - - Utils\XML - Net @@ -216,6 +156,9 @@ Game + + Graphics + @@ -257,12 +200,6 @@ Common - - Debug - - - Debug - Filesystem @@ -317,9 +254,6 @@ Math - - Math - Net @@ -335,21 +269,9 @@ Utils - - UI - - - Tilemap - Thread - - Physics - - - Physics - Time @@ -369,30 +291,6 @@ Common - - Utils\Component - - - Utils\Component - - - Utils\CSV - - - Utils\EventMsgCenter - - - Utils\EventMsgCenter - - - Utils\Json - - - Utils\XML - - - Utils\Proxy - Net @@ -418,6 +316,24 @@ Common + + Common + + + Common + + + Math + + + Math + + + Math + + + Graphics + -- cgit v1.1-26-g67d0