Skip to content

Commit

Permalink
now --help runs on win32
Browse files Browse the repository at this point in the history 
git-svn-id: http://kazuho.31tools.com/svn/incline/trunk@266 4d3e2a30-9d6d-0410-bc8c-dac56cff10b3
  • Loading branch information
kazuho committed Nov 10, 2009
1 parent e2dbead commit b8579e3
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 108 deletions.
19 changes: 8 additions & 11 deletions win32/incline.sln
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,21 +1,18 @@


Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2005 # Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "incline", "incline.vcproj", "{D455B920-6C6C-4644-950A-71AF92F2E88E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "incline", "incline.vcproj", "{20B4B950-0242-4C19-8F80-BF972EF2C795}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
MySQL Debug|Win32 = MySQL Debug|Win32 MySQL Debug|Win32 = MySQL Debug|Win32
Release|Win32 = Release|Win32 MySQL Release|Win32 = MySQL Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D455B920-6C6C-4644-950A-71AF92F2E88E}.Debug|Win32.ActiveCfg = Debug|Win32 {20B4B950-0242-4C19-8F80-BF972EF2C795}.MySQL Debug|Win32.ActiveCfg = MySQL Release|Win32
{D455B920-6C6C-4644-950A-71AF92F2E88E}.Debug|Win32.Build.0 = Debug|Win32 {20B4B950-0242-4C19-8F80-BF972EF2C795}.MySQL Debug|Win32.Build.0 = MySQL Release|Win32
{D455B920-6C6C-4644-950A-71AF92F2E88E}.MySQL Debug|Win32.ActiveCfg = MySQL Debug|Win32 {20B4B950-0242-4C19-8F80-BF972EF2C795}.MySQL Release|Win32.ActiveCfg = MySQL Debug|Win32
{D455B920-6C6C-4644-950A-71AF92F2E88E}.MySQL Debug|Win32.Build.0 = MySQL Debug|Win32 {20B4B950-0242-4C19-8F80-BF972EF2C795}.MySQL Release|Win32.Build.0 = MySQL Debug|Win32
{D455B920-6C6C-4644-950A-71AF92F2E88E}.Release|Win32.ActiveCfg = Release|Win32
{D455B920-6C6C-4644-950A-71AF92F2E88E}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
Expand Down
130 changes: 36 additions & 94 deletions win32/incline.vcproj
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="shift_jis"?> <?xml version="1.0" encoding="shift_jis"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="9.00"
Name="incline" Name="incline"
ProjectGUID="{D455B920-6C6C-4644-950A-71AF92F2E88E}" ProjectGUID="{20B4B950-0242-4C19-8F80-BF972EF2C795}"
RootNamespace="incline" RootNamespace="incline"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="196613"
> >
<Platforms> <Platforms>
<Platform <Platform
Expand All @@ -16,7 +17,7 @@
</ToolFiles> </ToolFiles>
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="MySQL Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
Expand All @@ -40,14 +41,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="src" AdditionalIncludeDirectories="&quot;C:\Program Files\MySQL\MySQL Server 5.1\include&quot;;src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;WITH_MYSQL;_DEBUG;_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
Expand All @@ -61,6 +61,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;C:\Program Files\MySQL\MySQL Server 5.1\lib\debug\mysqlclient.lib&quot; wsock32.lib"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
Expand All @@ -84,15 +85,12 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="MySQL Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
Expand All @@ -116,11 +114,14 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" Optimization="2"
RuntimeLibrary="2" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;C:\Program Files\MySQL\MySQL Server 5.1\include&quot;;src"
PreprocessorDefinitions="WIN32;WITH_MYSQL;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
Expand All @@ -134,6 +135,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;C:\Program Files\MySQL\MySQL Server 5.1\lib\opt\mysqlclient.lib&quot; wsock32.lib"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
Expand All @@ -159,86 +161,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="MySQL Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;C:\Program Files\MySQL\MySQL Server 5.1\include&quot;;&quot;pthreads-win32\include&quot;;src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_MYSQL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="&quot;C:\Program Files\MySQL\MySQL Server 5.1\lib\debug\mysqlclient.lib&quot; pthreads-win32\lib\pthreadVC2.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
Expand Down Expand Up @@ -335,6 +257,14 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="MySQL Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\src\incline_util.cc" RelativePath="..\src\incline_util.cc"
Expand All @@ -350,6 +280,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\src\cac\cac_mutex.h"
>
</File>
<File <File
RelativePath=".\src\getopt.h" RelativePath=".\src\getopt.h"
> >
Expand Down Expand Up @@ -437,6 +371,14 @@
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="MySQL Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\src\incline_util.h" RelativePath="..\src\incline_util.h"
Expand Down
6 changes: 3 additions & 3 deletions win32/src/incline_win32.cc
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ void iw32_sleep(unsigned int seconds)
} }


struct iw32_thread_start { struct iw32_thread_start {
void (*start_routine)(void*); void* (*start_routine)(void*);
void* arg; void* arg;
iw32_thread_start(void (*r)(void*), void* a) : start_routine(r), arg(a) {} iw32_thread_start(void* (*r)(void*), void* a) : start_routine(r), arg(a) {}
}; };


static unsigned __stdcall start_cb(void* _ts) static unsigned __stdcall start_cb(void* _ts)
Expand All @@ -24,7 +24,7 @@ static unsigned __stdcall start_cb(void* _ts)
return 0; return 0;
} }


int iw32_pthread_create(HANDLE* thread, const void* _unused, void (*start_routine)(void*), void* arg) int iw32_pthread_create(HANDLE* thread, const void* _unused, void* (*start_routine)(void*), void* arg)
{ {
assert(_unused == NULL); assert(_unused == NULL);
iw32_thread_start* ts = new iw32_thread_start(start_routine, arg); iw32_thread_start* ts = new iw32_thread_start(start_routine, arg);
Expand Down

0 comments on commit b8579e3

Please sign in to comment.