Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Foolmerge1 #172

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Foolmerge1 #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e2deb45
added strutil.hpp
OldFoolAgain Apr 7, 2023
1adef4f
Update strutil.hpp
Apr 7, 2023
094a600
organization
OldFoolAgain Apr 11, 2023
db8bfd0
Update CMakeLists.txt
OldFoolAgain Apr 11, 2023
ea3231d
windows projects
OldFoolAgain Apr 12, 2023
d5398d6
windows
OldFoolAgain Apr 12, 2023
7f78c87
Merge branch 'whatcouldbe' into foolmerge1
OldFoolAgain Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

[Bb]uild/

xcuserdata/

*.xcscheme



Expand Down
42 changes: 21 additions & 21 deletions make/VS2017/uox3.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,18 @@
<OutDir>.\Release\x86\</OutDir>
<IntDir>.\Release\x86\</IntDir>
<LinkIncremental>false</LinkIncremental>
<LibraryPath>..\..\spidermonkey\make\VS2017\jscript\Release\;..\..\zlib\make\VS2017\Release;$(LibraryPath)</LibraryPath>
<SourcePath>..\..\spidermonkey;..\..\zlib;$(SourcePath)</SourcePath>
<IncludePath>..\..\spidermonkey;..\..\zlib;$(IncludePath)</IncludePath>
<LibraryPath>..\..\support\spidermonkey\make\VS2017\jscript\Release\;..\..\support\zlib\make\VS2017\Release;$(LibraryPath)</LibraryPath>
<SourcePath>..\..\support\spidermonkey;..\..\support\zlib;$(SourcePath)</SourcePath>
<IncludePath>..\..\support;..\..\support\spidermonkey;..\..\support\zlib;$(IncludePath)</IncludePath>
<TargetName>UOX3</TargetName>
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<LibraryPath>..\..\zlib\make\VS2017\x64\Release;..\..\spidermonkey\make\VS2017\jscript\x64\Release;$(LibraryPath)</LibraryPath>
<SourcePath>..\..\zlib;..\..\spidermonkey;$(SourcePath)</SourcePath>
<IncludePath>..\..\zlib;..\..\spidermonkey;$(IncludePath)</IncludePath>
<LibraryPath>..\..\support\zlib\make\VS2017\x64\Release;..\..\support\spidermonkey\make\VS2017\jscript\x64\Release;$(LibraryPath)</LibraryPath>
<SourcePath>..\..\support\zlib;..\..\support\spidermonkey;$(SourcePath)</SourcePath>
<IncludePath>..\..\support;..\..\support\zlib;..\..\support\spidermonkey;$(IncludePath)</IncludePath>
<TargetName>UOX3</TargetName>
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis>
Expand All @@ -131,16 +131,16 @@
<OutDir>.\Debug\x86\</OutDir>
<IntDir>.\Debug\x86\</IntDir>
<LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\spidermonkey\make\VS2017\jscript\Debug;..\..\zlib\make\VS2017\Debug;$(LibraryPath)</LibraryPath>
<SourcePath>..\..\spidermonkey;..\..\zlib;$(SourcePath)</SourcePath>
<IncludePath>..\..\spidermonkey;..\..\zlib;$(IncludePath)</IncludePath>
<LibraryPath>..\..\support\spidermonkey\make\VS2017\jscript\Debug;..\..\support\zlib\make\VS2017\Debug;$(LibraryPath)</LibraryPath>
<SourcePath>..\..\support\spidermonkey;..\..\support\zlib;$(SourcePath)</SourcePath>
<IncludePath>..\..\support;..\..\support\spidermonkey;..\..\support\zlib;$(IncludePath)</IncludePath>
<TargetName>UOX3_debug</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\spidermonkey\make\VS2017\jscript\x64\Debug;..\..\zlib\make\VS2017\x64\Debug;$(LibraryPath)</LibraryPath>
<SourcePath>..\..\spidermonkey;..\..\zlib;$(SourcePath)</SourcePath>
<IncludePath>..\..\spidermonkey;..\..\zlib;$(IncludePath)</IncludePath>
<LibraryPath>..\..\support\spidermonkey\make\VS2017\jscript\x64\Debug;..\..\support\zlib\make\VS2017\x64\Debug;$(LibraryPath)</LibraryPath>
<SourcePath>..\..\support\spidermonkey;..\..\support\zlib;$(SourcePath)</SourcePath>
<IncludePath>..\..\support;..\..\support\spidermonkey;..\..\support\zlib;$(IncludePath)</IncludePath>
<TargetName>UOX3_debug</TargetName>
<OutDir>.\Debug\x64\</OutDir>
<IntDir>.\Debug\x64\</IntDir>
Expand Down Expand Up @@ -171,10 +171,10 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Link>
<AdditionalDependencies>wsock32.lib;ws2_32.lib;jscript.lib;zlib-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>wsock32.lib;ws2_32.lib;jscript.lib;support\zlib-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\spidermonkey\make\VS2017\Release;..\zlib\make\VS2017\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\support;..\..\support\spidermonkey\make\VS2017\Release;..\support\zlib\make\VS2017\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
Expand Down Expand Up @@ -216,10 +216,10 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Link>
<AdditionalDependencies>wsock32.lib;ws2_32.lib;jscript.lib;zlib-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>wsock32.lib;ws2_32.lib;jscript.lib;support\zlib-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\zlib\make\VS2017\x64\Release\;..\..\spidermonkey\make\VS2017\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\support\zlib\make\VS2017\x64\Release\;..\..\support\spidermonkey\make\VS2017\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
Expand Down Expand Up @@ -327,10 +327,10 @@
<IntrinsicFunctions>false</IntrinsicFunctions>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;jscript.lib;zlib-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;jscript.lib;support\zlib-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\spidermonkey\make\VS2017\Release;..\..\zlib\make\VS2017\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\support\spidermonkey\make\VS2017\Release;..\..\support\zlib\make\VS2017\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
Expand Down Expand Up @@ -369,10 +369,10 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;jscript.lib;zlib-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;jscript.lib;support\zlib-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\spidermonkey\make\VS2017\x64\Release;..\..\zlib\make\VS2017\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\support\spidermonkey\make\VS2017\x64\Release;..\..\support\zlib\make\VS2017\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
Expand Down Expand Up @@ -1469,4 +1469,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
41 changes: 35 additions & 6 deletions make/VS2022/uox3.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,57 @@ VisualStudioVersion = 17.4.33122.133
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uox3", "uox3.vcxproj", "{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jscript", "..\..\spidermonkey\make\vs2022\jscript\jscript.vcxproj", "{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}"

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\support\zlib\make\VS2022\zlib.vcxproj", "{091529FD-5075-45F1-9D96-5708B3AB7C2B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\zlib\make\vs2022\zlib.vcxproj", "{091529FD-5075-45F1-9D96-5708B3AB7C2B}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jscript", "..\..\support\spidermonkey\make\VS2022\jscript\jscript.vcxproj", "{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}"

EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utility", "..\..\support\utility\utility.vcxproj", "{2E9DCD9A-7FC0-4CD6-8F8B-D3EE75832DE5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Debug|x64.ActiveCfg = Debug|x64
{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Debug|x64.Build.0 = Debug|x64
{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Debug|x86.ActiveCfg = Debug|x64
{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Debug|x86.Build.0 = Debug|x64
{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Release|x64.ActiveCfg = Release|x64
{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Release|x64.Build.0 = Release|x64
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Debug|x64.ActiveCfg = Debug|x64
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Debug|x64.Build.0 = Debug|x64
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Release|x64.ActiveCfg = Release|x64
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Release|x64.Build.0 = Release|x64
{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Release|x86.ActiveCfg = Release|x64
{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Release|x86.Build.0 = Release|x64

{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Debug|x64.ActiveCfg = Debug|x64
{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Debug|x64.Build.0 = Debug|x64
{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Debug|x86.ActiveCfg = Debug|Win32
{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Debug|x86.Build.0 = Debug|Win32
{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Release|x64.ActiveCfg = Release|x64
{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Release|x64.Build.0 = Release|x64
{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Release|x86.ActiveCfg = Release|Win32
{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Release|x86.Build.0 = Release|Win32

{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Debug|x64.ActiveCfg = Debug|x64
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Debug|x64.Build.0 = Debug|x64
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Debug|x86.ActiveCfg = Debug|Win32
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Debug|x86.Build.0 = Debug|Win32
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Release|x64.ActiveCfg = Release|x64
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Release|x64.Build.0 = Release|x64
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Release|x86.ActiveCfg = Release|Win32
{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Release|x86.Build.0 = Release|Win32

{2E9DCD9A-7FC0-4CD6-8F8B-D3EE75832DE5}.Debug|x64.ActiveCfg = Debug|x64
{2E9DCD9A-7FC0-4CD6-8F8B-D3EE75832DE5}.Debug|x64.Build.0 = Debug|x64
{2E9DCD9A-7FC0-4CD6-8F8B-D3EE75832DE5}.Debug|x86.ActiveCfg = Debug|Win32
{2E9DCD9A-7FC0-4CD6-8F8B-D3EE75832DE5}.Debug|x86.Build.0 = Debug|Win32
{2E9DCD9A-7FC0-4CD6-8F8B-D3EE75832DE5}.Release|x64.ActiveCfg = Release|x64
{2E9DCD9A-7FC0-4CD6-8F8B-D3EE75832DE5}.Release|x64.Build.0 = Release|x64
{2E9DCD9A-7FC0-4CD6-8F8B-D3EE75832DE5}.Release|x86.ActiveCfg = Release|Win32
{2E9DCD9A-7FC0-4CD6-8F8B-D3EE75832DE5}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
15 changes: 11 additions & 4 deletions make/VS2022/uox3.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@
<PrecompiledHeaderFile />
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions> /J</AdditionalOptions>
<AdditionalIncludeDirectories>..\..\source;..\..\zlib;..\..\spidermonkey</AdditionalIncludeDirectories>

<AdditionalIncludeDirectories>..\..\source;..\..\support\zlib;..\..\support\spidermonkey;..\..\support</AdditionalIncludeDirectories>

<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -78,7 +80,9 @@
<PrecompiledHeaderFile />
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions> /J</AdditionalOptions>
<AdditionalIncludeDirectories>..\..\source;..\..\zlib;..\..\spidermonkey</AdditionalIncludeDirectories>

<AdditionalIncludeDirectories>..\..\source;..\..\support\zlib;..\..\support\spidermonkey;..\..\support</AdditionalIncludeDirectories>

<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
Expand Down Expand Up @@ -256,10 +260,13 @@
<ResourceCompile Include="..\..\assets\uox3.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\spidermonkey\make\vs2022\jscript\jscript.vcxproj">
<ProjectReference Include="..\..\support\spidermonkey\make\VS2022\jscript\jscript.vcxproj">
<Project>{2af3a5ea-0cec-4d24-80f7-05e0b8b300c5}</Project>
</ProjectReference>
<ProjectReference Include="..\..\zlib\make\vs2022\zlib.vcxproj">
<ProjectReference Include="..\..\support\utility\utility.vcxproj">
<Project>{2e9dcd9a-7fc0-4cd6-8f8b-d3ee75832de5}</Project>
</ProjectReference>
<ProjectReference Include="..\..\support\zlib\make\VS2022\zlib.vcxproj">
<Project>{091529fd-5075-45f1-9d96-5708b3ab7c2b}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
Loading