Skip to content

Commit 10fdd52

Browse files
author
nshmyrev
committed
Windows fixes
git-svn-id: svn+ssh://svn.code.sf.net/p/cmusphinx/code/trunk/sphinxbase@13163 94700074-3cef-4d97-a70e-9c8c206c02f5
1 parent 7bd4b6f commit 10fdd52

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

‎sphinxbase.sln

+31-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio Express 2012 for Windows Desktop
44
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sphinx_cepview", "win32\sphinx_cepview\sphinx_cepview.vcxproj", "{06364F13-FBCE-4E2B-9289-0DD39E246205}"
55
EndProject
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sphinx_fe", "win32\sphinx_fe\sphinx_fe.vcxproj", "{D088C451-BB4D-4379-AFFA-C7523DBD35DD}"
@@ -18,38 +18,67 @@ EndProject
1818
Global
1919
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2020
Debug|Win32 = Debug|Win32
21+
Debug|x64 = Debug|x64
2122
Release|Win32 = Release|Win32
23+
Release|x64 = Release|x64
2224
EndGlobalSection
2325
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2426
{06364F13-FBCE-4E2B-9289-0DD39E246205}.Debug|Win32.ActiveCfg = Debug|Win32
2527
{06364F13-FBCE-4E2B-9289-0DD39E246205}.Debug|Win32.Build.0 = Debug|Win32
26-
{06364F13-FBCE-4E2B-9289-0DD39E246205}.Debug|Win32.Deploy.0 = Debug|Win32
28+
{06364F13-FBCE-4E2B-9289-0DD39E246205}.Debug|x64.ActiveCfg = Debug|x64
29+
{06364F13-FBCE-4E2B-9289-0DD39E246205}.Debug|x64.Build.0 = Debug|x64
2730
{06364F13-FBCE-4E2B-9289-0DD39E246205}.Release|Win32.ActiveCfg = Release|Win32
2831
{06364F13-FBCE-4E2B-9289-0DD39E246205}.Release|Win32.Build.0 = Release|Win32
32+
{06364F13-FBCE-4E2B-9289-0DD39E246205}.Release|x64.ActiveCfg = Release|x64
33+
{06364F13-FBCE-4E2B-9289-0DD39E246205}.Release|x64.Build.0 = Release|x64
2934
{D088C451-BB4D-4379-AFFA-C7523DBD35DD}.Debug|Win32.ActiveCfg = Debug|Win32
3035
{D088C451-BB4D-4379-AFFA-C7523DBD35DD}.Debug|Win32.Build.0 = Debug|Win32
36+
{D088C451-BB4D-4379-AFFA-C7523DBD35DD}.Debug|x64.ActiveCfg = Debug|x64
37+
{D088C451-BB4D-4379-AFFA-C7523DBD35DD}.Debug|x64.Build.0 = Debug|x64
3138
{D088C451-BB4D-4379-AFFA-C7523DBD35DD}.Release|Win32.ActiveCfg = Release|Win32
3239
{D088C451-BB4D-4379-AFFA-C7523DBD35DD}.Release|Win32.Build.0 = Release|Win32
40+
{D088C451-BB4D-4379-AFFA-C7523DBD35DD}.Release|x64.ActiveCfg = Release|x64
41+
{D088C451-BB4D-4379-AFFA-C7523DBD35DD}.Release|x64.Build.0 = Release|x64
3342
{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Debug|Win32.ActiveCfg = Debug|Win32
3443
{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Debug|Win32.Build.0 = Debug|Win32
44+
{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Debug|x64.ActiveCfg = Debug|x64
45+
{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Debug|x64.Build.0 = Debug|x64
3546
{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Release|Win32.ActiveCfg = Release|Win32
3647
{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Release|Win32.Build.0 = Release|Win32
48+
{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Release|x64.ActiveCfg = Release|x64
49+
{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.Release|x64.Build.0 = Release|x64
3750
{0E6AF9F5-8904-4873-8856-7216415782B4}.Debug|Win32.ActiveCfg = Debug|Win32
3851
{0E6AF9F5-8904-4873-8856-7216415782B4}.Debug|Win32.Build.0 = Debug|Win32
52+
{0E6AF9F5-8904-4873-8856-7216415782B4}.Debug|x64.ActiveCfg = Debug|x64
53+
{0E6AF9F5-8904-4873-8856-7216415782B4}.Debug|x64.Build.0 = Debug|x64
3954
{0E6AF9F5-8904-4873-8856-7216415782B4}.Release|Win32.ActiveCfg = Release|Win32
4055
{0E6AF9F5-8904-4873-8856-7216415782B4}.Release|Win32.Build.0 = Release|Win32
56+
{0E6AF9F5-8904-4873-8856-7216415782B4}.Release|x64.ActiveCfg = Release|x64
57+
{0E6AF9F5-8904-4873-8856-7216415782B4}.Release|x64.Build.0 = Release|x64
4158
{AFB07B69-EDC1-4E99-B0F3-E6B14FF07C5D}.Debug|Win32.ActiveCfg = Debug|Win32
4259
{AFB07B69-EDC1-4E99-B0F3-E6B14FF07C5D}.Debug|Win32.Build.0 = Debug|Win32
60+
{AFB07B69-EDC1-4E99-B0F3-E6B14FF07C5D}.Debug|x64.ActiveCfg = Debug|x64
61+
{AFB07B69-EDC1-4E99-B0F3-E6B14FF07C5D}.Debug|x64.Build.0 = Debug|x64
4362
{AFB07B69-EDC1-4E99-B0F3-E6B14FF07C5D}.Release|Win32.ActiveCfg = Release|Win32
4463
{AFB07B69-EDC1-4E99-B0F3-E6B14FF07C5D}.Release|Win32.Build.0 = Release|Win32
64+
{AFB07B69-EDC1-4E99-B0F3-E6B14FF07C5D}.Release|x64.ActiveCfg = Release|x64
65+
{AFB07B69-EDC1-4E99-B0F3-E6B14FF07C5D}.Release|x64.Build.0 = Release|x64
4566
{AF17E630-A43F-4E0A-9BC4-67CD4E2E7FA1}.Debug|Win32.ActiveCfg = Debug|Win32
4667
{AF17E630-A43F-4E0A-9BC4-67CD4E2E7FA1}.Debug|Win32.Build.0 = Debug|Win32
68+
{AF17E630-A43F-4E0A-9BC4-67CD4E2E7FA1}.Debug|x64.ActiveCfg = Debug|x64
69+
{AF17E630-A43F-4E0A-9BC4-67CD4E2E7FA1}.Debug|x64.Build.0 = Debug|x64
4770
{AF17E630-A43F-4E0A-9BC4-67CD4E2E7FA1}.Release|Win32.ActiveCfg = Release|Win32
4871
{AF17E630-A43F-4E0A-9BC4-67CD4E2E7FA1}.Release|Win32.Build.0 = Release|Win32
72+
{AF17E630-A43F-4E0A-9BC4-67CD4E2E7FA1}.Release|x64.ActiveCfg = Release|x64
73+
{AF17E630-A43F-4E0A-9BC4-67CD4E2E7FA1}.Release|x64.Build.0 = Release|x64
4974
{42DFD84F-14DB-42D1-B14D-B8C5ABCBA0E8}.Debug|Win32.ActiveCfg = Debug|Win32
5075
{42DFD84F-14DB-42D1-B14D-B8C5ABCBA0E8}.Debug|Win32.Build.0 = Debug|Win32
76+
{42DFD84F-14DB-42D1-B14D-B8C5ABCBA0E8}.Debug|x64.ActiveCfg = Debug|x64
77+
{42DFD84F-14DB-42D1-B14D-B8C5ABCBA0E8}.Debug|x64.Build.0 = Debug|x64
5178
{42DFD84F-14DB-42D1-B14D-B8C5ABCBA0E8}.Release|Win32.ActiveCfg = Release|Win32
5279
{42DFD84F-14DB-42D1-B14D-B8C5ABCBA0E8}.Release|Win32.Build.0 = Release|Win32
80+
{42DFD84F-14DB-42D1-B14D-B8C5ABCBA0E8}.Release|x64.ActiveCfg = Release|x64
81+
{42DFD84F-14DB-42D1-B14D-B8C5ABCBA0E8}.Release|x64.Build.0 = Release|x64
5382
EndGlobalSection
5483
GlobalSection(SolutionProperties) = preSolution
5584
HideSolutionNode = FALSE

‎src/libsphinxbase/lm/fsg_model.c

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "sphinxbase/strfuncs.h"
4545
#include "sphinxbase/hash_table.h"
4646
#include "sphinxbase/fsg_model.h"
47+
#include "sphinxbase/bitvec.h"
4748

4849
/**
4950
* Adjacency list (opaque) for a state in an FSG.

0 commit comments

Comments
 (0)