Skip to content

Commit 01e9397

Browse files
onecoolxonecoolx
committed
fix windws build
1 parent 99fd69d commit 01e9397

34 files changed

+4319
-4101
lines changed

‎src/picasso.rc

+8-10
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@
1313
#undef APSTUDIO_READONLY_SYMBOLS
1414

1515
/////////////////////////////////////////////////////////////////////////////
16-
// ����(�л����񹲺͹�) resources
16+
// ����(���壬�й�) resources
1717

1818
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
19-
#ifdef _WIN32
2019
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
2120
#pragma code_page(936)
22-
#endif //_WIN32
2321

2422
#ifdef APSTUDIO_INVOKED
2523
/////////////////////////////////////////////////////////////////////////////
@@ -53,8 +51,8 @@ END
5351
//
5452

5553
VS_VERSION_INFO VERSIONINFO
56-
FILEVERSION 2,3,2,1
57-
PRODUCTVERSION 2,3,2,1
54+
FILEVERSION 2,5,0,1
55+
PRODUCTVERSION 2,5,0,1
5856
FILEFLAGSMASK 0x1fL
5957
#ifdef _DEBUG
6058
FILEFLAGS 0x9L
@@ -69,16 +67,16 @@ BEGIN
6967
BEGIN
7068
BLOCK "080404b0"
7169
BEGIN
72-
VALUE "Comments", "Vector Graphic library"
70+
VALUE "Comments", "Vector 2D Graphic library"
7371
VALUE "CompanyName", "picasso.inc"
7472
VALUE "FileDescription", "picasso2 ��̬���ӿ�"
75-
VALUE "FileVersion", "2, 3, 2, 1"
73+
VALUE "FileVersion", "2.5.0.1"
7674
VALUE "InternalName", "picasso2"
77-
VALUE "LegalCopyright", "Copyright (C) 2018"
75+
VALUE "LegalCopyright", "Copyright (C) 2023"
7876
VALUE "OriginalFilename", "picasso2_sw.dll"
7977
VALUE "PrivateBuild", "2257"
8078
VALUE "ProductName", "picasso2 ��̬���ӿ�"
81-
VALUE "ProductVersion", "2, 3, 2, 1"
79+
VALUE "ProductVersion", "2.5.0.1"
8280
END
8381
END
8482
BLOCK "VarFileInfo"
@@ -87,7 +85,7 @@ BEGIN
8785
END
8886
END
8987

90-
#endif // ����(�л����񹲺͹�) resources
88+
#endif // ����(���壬�й�) resources
9189
/////////////////////////////////////////////////////////////////////////////
9290

9391

‎vcproj/alpha.vcxproj

+138-131
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,138 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Win32">
5-
<Configuration>Debug</Configuration>
6-
<Platform>Win32</Platform>
7-
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Release|Win32">
9-
<Configuration>Release</Configuration>
10-
<Platform>Win32</Platform>
11-
</ProjectConfiguration>
12-
</ItemGroup>
13-
<PropertyGroup Label="Globals">
14-
<ProjectGuid>{992EE1C8-A1F5-9FF6-5ABB-CF0A8422FDE5}</ProjectGuid>
15-
<Keyword>Win32Proj</Keyword>
16-
<RootNamespace>alpha</RootNamespace>
17-
</PropertyGroup>
18-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
19-
<PropertyGroup Label="Configuration">
20-
<CharacterSet>Unicode</CharacterSet>
21-
<ConfigurationType>Application</ConfigurationType>
22-
</PropertyGroup>
23-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
24-
<ImportGroup Label="ExtensionSettings"/>
25-
<ImportGroup Label="PropertySheets">
26-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
27-
</ImportGroup>
28-
<PropertyGroup Label="UserMacros"/>
29-
<PropertyGroup>
30-
<ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\bin\;$(MSBuildProjectDirectory)\..\bin\</ExecutablePath>
31-
<IntDir>$(Configuration)\obj\$(ProjectName)\</IntDir>
32-
<LinkIncremental>false</LinkIncremental>
33-
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
34-
<TargetName>$(ProjectName)</TargetName>
35-
<TargetPath>$(OutDir)\$(ProjectName)$(TargetExt)</TargetPath>
36-
</PropertyGroup>
37-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
38-
<ClCompile>
39-
<AdditionalIncludeDirectories>..\include;..\build;..\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
40-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
41-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
42-
<ExceptionHandling>false</ExceptionHandling>
43-
<MinimalRebuild>true</MinimalRebuild>
44-
<Optimization>Disabled</Optimization>
45-
<PreprocessorDefinitions>WIN32;DLL_EXPORT;ENABLE_FAST_COPY=1;ENABLE_SYSTEM_MALLOC=1;__SSE2__=1;_HAS_EXCEPTIONS=0;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
46-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
47-
<RuntimeTypeInfo>false</RuntimeTypeInfo>
48-
<SuppressStartupBanner>true</SuppressStartupBanner>
49-
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
50-
<TreatWarningAsError>true</TreatWarningAsError>
51-
<WarningLevel>Level3</WarningLevel>
52-
</ClCompile>
53-
<Link>
54-
<DataExecutionPrevention></DataExecutionPrevention>
55-
<GenerateDebugInformation>true</GenerateDebugInformation>
56-
<OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
57-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
58-
<SuppressStartupBanner>true</SuppressStartupBanner>
59-
<TargetMachine>MachineX86</TargetMachine>
60-
</Link>
61-
<ResourceCompile>
62-
<AdditionalIncludeDirectories>..\include;..\build;..\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
63-
<PreprocessorDefinitions>WIN32;DLL_EXPORT;ENABLE_FAST_COPY=1;ENABLE_SYSTEM_MALLOC=1;__SSE2__=1;_HAS_EXCEPTIONS=0;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
64-
</ResourceCompile>
65-
</ItemDefinitionGroup>
66-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67-
<ClCompile>
68-
<AdditionalIncludeDirectories>..\include;..\build;..\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
69-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
70-
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
71-
<ExceptionHandling>false</ExceptionHandling>
72-
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
73-
<FloatingPointModel>Fast</FloatingPointModel>
74-
<FunctionLevelLinking>true</FunctionLevelLinking>
75-
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
76-
<Optimization>Full</Optimization>
77-
<PreprocessorDefinitions>WIN32;DLL_EXPORT;ENABLE_FAST_COPY=1;ENABLE_SYSTEM_MALLOC=1;__SSE2__=1;_HAS_EXCEPTIONS=0;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
78-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
79-
<RuntimeTypeInfo>false</RuntimeTypeInfo>
80-
<StringPooling>true</StringPooling>
81-
<SuppressStartupBanner>true</SuppressStartupBanner>
82-
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
83-
<TreatWarningAsError>true</TreatWarningAsError>
84-
<WarningLevel>Level3</WarningLevel>
85-
<WholeProgramOptimization>true</WholeProgramOptimization>
86-
</ClCompile>
87-
<Link>
88-
<DataExecutionPrevention></DataExecutionPrevention>
89-
<GenerateDebugInformation>false</GenerateDebugInformation>
90-
<GenerateMapFile>true</GenerateMapFile>
91-
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
92-
<OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
93-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
94-
<SuppressStartupBanner>true</SuppressStartupBanner>
95-
<TargetMachine>MachineX86</TargetMachine>
96-
</Link>
97-
<ResourceCompile>
98-
<AdditionalIncludeDirectories>..\include;..\build;..\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
99-
<PreprocessorDefinitions>WIN32;DLL_EXPORT;ENABLE_FAST_COPY=1;ENABLE_SYSTEM_MALLOC=1;__SSE2__=1;_HAS_EXCEPTIONS=0;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
100-
</ResourceCompile>
101-
</ItemDefinitionGroup>
102-
<ItemGroup>
103-
<None Include="..\picasso.gyp"/>
104-
</ItemGroup>
105-
<ItemGroup>
106-
<ClCompile Include="..\test\alpha_func.c"/>
107-
<ClCompile Include="..\test\testWin.c"/>
108-
</ItemGroup>
109-
<ItemGroup>
110-
<CustomBuild Include="..\test\pat.bmp">
111-
<FileType>Document</FileType>
112-
<Command>call call python &quot;..\tools\cp.py&quot; &quot;..\test\pat.bmp&quot; &quot;$(OutDir)pat.bmp&quot;</Command>
113-
<Message>copy_img1</Message>
114-
<Outputs>$(OutDir)\pat.bmp</Outputs>
115-
</CustomBuild>
116-
<CustomBuild Include="..\test\selt2.bmp">
117-
<FileType>Document</FileType>
118-
<Command>call call python &quot;..\tools\cp.py&quot; &quot;..\test\selt2.bmp&quot; &quot;$(OutDir)selt2.bmp&quot;</Command>
119-
<Message>copy_img2</Message>
120-
<Outputs>$(OutDir)\selt2.bmp</Outputs>
121-
</CustomBuild>
122-
</ItemGroup>
123-
<ItemGroup>
124-
<ProjectReference Include="picasso2_sw.vcxproj">
125-
<Project>{D76D2325-CDDA-3A00-A705-7EFFD069C6D8}</Project>
126-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
127-
</ProjectReference>
128-
</ItemGroup>
129-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
130-
<ImportGroup Label="ExtensionTargets"/>
131-
</Project>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<ProjectGuid>{992EE1C8-A1F5-9FF6-5ABB-CF0A8422FDE5}</ProjectGuid>
15+
<Keyword>Win32Proj</Keyword>
16+
<RootNamespace>alpha</RootNamespace>
17+
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
18+
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
19+
</PropertyGroup>
20+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
21+
<PropertyGroup Label="Configuration">
22+
<CharacterSet>Unicode</CharacterSet>
23+
<ConfigurationType>Application</ConfigurationType>
24+
</PropertyGroup>
25+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
26+
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props"/>
27+
<ImportGroup Label="ExtensionSettings"/>
28+
<ImportGroup Label="PropertySheets">
29+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
30+
</ImportGroup>
31+
<PropertyGroup Label="UserMacros"/>
32+
<PropertyGroup>
33+
<ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\bin\;$(MSBuildProjectDirectory)\..\bin\</ExecutablePath>
34+
<IntDir>$(Configuration)\obj\$(ProjectName)\</IntDir>
35+
<LinkIncremental>false</LinkIncremental>
36+
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
37+
<TargetName>$(ProjectName)</TargetName>
38+
<TargetPath>$(OutDir)\$(ProjectName)$(TargetExt)</TargetPath>
39+
</PropertyGroup>
40+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
41+
<ClCompile>
42+
<AdditionalIncludeDirectories>..\include;..\build;..\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
43+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
44+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
45+
<ExceptionHandling>false</ExceptionHandling>
46+
<Optimization>Disabled</Optimization>
47+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
48+
<PreprocessorDefinitions>WIN32;DLL_EXPORT;ENABLE_FAST_COPY=1;ENABLE_SYSTEM_MALLOC=1;__SSE2__=1;_HAS_EXCEPTIONS=0;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
49+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
50+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
51+
<SuppressStartupBanner>true</SuppressStartupBanner>
52+
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
53+
<TreatWarningAsError>true</TreatWarningAsError>
54+
<WarningLevel>Level3</WarningLevel>
55+
</ClCompile>
56+
<Link>
57+
<AdditionalDependencies>gdi32.lib;user32.lib</AdditionalDependencies>
58+
<DataExecutionPrevention></DataExecutionPrevention>
59+
<GenerateDebugInformation>true</GenerateDebugInformation>
60+
<OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
61+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
62+
<SuppressStartupBanner>true</SuppressStartupBanner>
63+
<TargetMachine>MachineX86</TargetMachine>
64+
</Link>
65+
<ResourceCompile>
66+
<AdditionalIncludeDirectories>..\include;..\build;..\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
67+
<PreprocessorDefinitions>WIN32;DLL_EXPORT;ENABLE_FAST_COPY=1;ENABLE_SYSTEM_MALLOC=1;__SSE2__=1;_HAS_EXCEPTIONS=0;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
68+
</ResourceCompile>
69+
</ItemDefinitionGroup>
70+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
71+
<ClCompile>
72+
<AdditionalIncludeDirectories>..\include;..\build;..\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
73+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
74+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
75+
<ExceptionHandling>false</ExceptionHandling>
76+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
77+
<FloatingPointModel>Fast</FloatingPointModel>
78+
<FunctionLevelLinking>true</FunctionLevelLinking>
79+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
80+
<Optimization>Full</Optimization>
81+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
82+
<PreprocessorDefinitions>WIN32;DLL_EXPORT;ENABLE_FAST_COPY=1;ENABLE_SYSTEM_MALLOC=1;__SSE2__=1;_HAS_EXCEPTIONS=0;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
83+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
84+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
85+
<StringPooling>true</StringPooling>
86+
<SuppressStartupBanner>true</SuppressStartupBanner>
87+
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
88+
<TreatWarningAsError>true</TreatWarningAsError>
89+
<WarningLevel>Level3</WarningLevel>
90+
<WholeProgramOptimization>true</WholeProgramOptimization>
91+
</ClCompile>
92+
<Link>
93+
<AdditionalDependencies>gdi32.lib;user32.lib</AdditionalDependencies>
94+
<DataExecutionPrevention></DataExecutionPrevention>
95+
<GenerateDebugInformation>false</GenerateDebugInformation>
96+
<GenerateMapFile>true</GenerateMapFile>
97+
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
98+
<OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
99+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
100+
<SuppressStartupBanner>true</SuppressStartupBanner>
101+
<TargetMachine>MachineX86</TargetMachine>
102+
</Link>
103+
<ResourceCompile>
104+
<AdditionalIncludeDirectories>..\include;..\build;..\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
105+
<PreprocessorDefinitions>WIN32;DLL_EXPORT;ENABLE_FAST_COPY=1;ENABLE_SYSTEM_MALLOC=1;__SSE2__=1;_HAS_EXCEPTIONS=0;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
106+
</ResourceCompile>
107+
</ItemDefinitionGroup>
108+
<ItemGroup>
109+
<None Include="..\picasso.gyp"/>
110+
</ItemGroup>
111+
<ItemGroup>
112+
<ClCompile Include="..\test\alpha_func.c"/>
113+
<ClCompile Include="..\test\testWin.c"/>
114+
</ItemGroup>
115+
<ItemGroup>
116+
<CustomBuild Include="..\test\pat.bmp">
117+
<FileType>Document</FileType>
118+
<Command>call call python &quot;..\tools\cp.py&quot; &quot;..\test\pat.bmp&quot; &quot;$(OutDir)pat.bmp&quot;&#xD;&#xA;if %errorlevel% neq 0 exit /b %errorlevel%</Command>
119+
<Message>copy_img1</Message>
120+
<Outputs>$(OutDir)\pat.bmp</Outputs>
121+
</CustomBuild>
122+
<CustomBuild Include="..\test\selt2.bmp">
123+
<FileType>Document</FileType>
124+
<Command>call call python &quot;..\tools\cp.py&quot; &quot;..\test\selt2.bmp&quot; &quot;$(OutDir)selt2.bmp&quot;&#xD;&#xA;if %errorlevel% neq 0 exit /b %errorlevel%</Command>
125+
<Message>copy_img2</Message>
126+
<Outputs>$(OutDir)\selt2.bmp</Outputs>
127+
</CustomBuild>
128+
</ItemGroup>
129+
<ItemGroup>
130+
<ProjectReference Include="picasso2_sw.vcxproj">
131+
<Project>{D76D2325-CDDA-3A00-A705-7EFFD069C6D8}</Project>
132+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
133+
</ProjectReference>
134+
</ItemGroup>
135+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
136+
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets"/>
137+
<ImportGroup Label="ExtensionTargets"/>
138+
</Project>

0 commit comments

Comments
 (0)