Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

now --help runs on win32

git-svn-id: http://kazuho.31tools.com/svn/incline/trunk@266 4d3e2a30-9d6d-0410-bc8c-dac56cff10b3
  • Loading branch information...
commit b8579e3a4b64a907b5bf48e3b8c0e51589de0077 1 parent e2dbead
kazuho authored
Showing with 47 additions and 108 deletions.
  1. +8 −11 win32/incline.sln
  2. +36 −94 win32/incline.vcproj
  3. +3 −3 win32/src/incline_win32.cc
19 win32/incline.sln
View
@@ -1,21 +1,18 @@

-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "incline", "incline.vcproj", "{D455B920-6C6C-4644-950A-71AF92F2E88E}"
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "incline", "incline.vcproj", "{20B4B950-0242-4C19-8F80-BF972EF2C795}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
MySQL Debug|Win32 = MySQL Debug|Win32
- Release|Win32 = Release|Win32
+ MySQL Release|Win32 = MySQL Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D455B920-6C6C-4644-950A-71AF92F2E88E}.Debug|Win32.ActiveCfg = Debug|Win32
- {D455B920-6C6C-4644-950A-71AF92F2E88E}.Debug|Win32.Build.0 = Debug|Win32
- {D455B920-6C6C-4644-950A-71AF92F2E88E}.MySQL Debug|Win32.ActiveCfg = MySQL Debug|Win32
- {D455B920-6C6C-4644-950A-71AF92F2E88E}.MySQL Debug|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
+ {20B4B950-0242-4C19-8F80-BF972EF2C795}.MySQL Debug|Win32.ActiveCfg = MySQL Release|Win32
+ {20B4B950-0242-4C19-8F80-BF972EF2C795}.MySQL Debug|Win32.Build.0 = MySQL Release|Win32
+ {20B4B950-0242-4C19-8F80-BF972EF2C795}.MySQL Release|Win32.ActiveCfg = MySQL Debug|Win32
+ {20B4B950-0242-4C19-8F80-BF972EF2C795}.MySQL Release|Win32.Build.0 = MySQL Debug|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
130 win32/incline.vcproj
View
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="shift_jis"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="incline"
- ProjectGUID="{D455B920-6C6C-4644-950A-71AF92F2E88E}"
+ ProjectGUID="{20B4B950-0242-4C19-8F80-BF972EF2C795}"
RootNamespace="incline"
Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
@@ -16,7 +17,7 @@
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
+ Name="MySQL Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
@@ -40,14 +41,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ AdditionalIncludeDirectories="&quot;C:\Program Files\MySQL\MySQL Server 5.1\include&quot;;src"
+ PreprocessorDefinitions="WIN32;WITH_MYSQL;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="&quot;C:\Program Files\MySQL\MySQL Server 5.1\lib\debug\mysqlclient.lib&quot; wsock32.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@@ -85,14 +86,11 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="MySQL Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
@@ -116,11 +114,14 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
+ Optimization="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"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -134,6 +135,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="&quot;C:\Program Files\MySQL\MySQL Server 5.1\lib\opt\mysqlclient.lib&quot; wsock32.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
@@ -160,86 +162,6 @@
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
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -335,6 +257,14 @@
Name="VCCLCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="MySQL Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\src\incline_util.cc"
@@ -351,6 +281,10 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
+ RelativePath="..\src\cac\cac_mutex.h"
+ >
+ </File>
+ <File
RelativePath=".\src\getopt.h"
>
</File>
@@ -437,6 +371,14 @@
Name="VCCustomBuildTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="MySQL Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\src\incline_util.h"
6 win32/src/incline_win32.cc
View
@@ -10,9 +10,9 @@ void iw32_sleep(unsigned int seconds)
}
struct iw32_thread_start {
- void (*start_routine)(void*);
+ void* (*start_routine)(void*);
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)
@@ -24,7 +24,7 @@ static unsigned __stdcall start_cb(void* _ts)
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);
iw32_thread_start* ts = new iw32_thread_start(start_routine, arg);
Please sign in to comment.
Something went wrong with that request. Please try again.