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.

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

Move the temporary grammar files into the build directory. #290

Conversation

MageKing17
Copy link
Member

These are only used for voice recognition on Windows. In addition, the gc.exe shouldn't be needed locally since it should be included with SAPI, which Visual Studio 2010 and later should already include.

I also tried to backport some of the changes from the 2013/2015 project files to the 2010/2012 project files, but lack of certain compiler flags made me tend to err on the conservative side in that regard.

Obviously, this PR will be obsoleted by the move to cmake, but I figure I might as well open it anyway since I did most of the work a while ago (just did the copy/paste job on the 2010/2012 projects for this PR).

@MageKing17
Copy link
Member Author

Okay, maybe not. AppVeyor's 2010 seems to not have SAPI and I don't even know what the 2012's atlbase.h error is about.

These are only used for voice recognition on Windows. In addition, the gc.exe shouldn't be needed locally since it should be included with SAPI, which Visual Studio 2010 and later should already include.

I also tried to backport some of the changes from the 2013/2015 project files to the 2010/2012 project files, but lack of certain compiler flags made me tend to err on the conservative side in that regard.
@MageKing17 MageKing17 force-pushed the cleanup/move-voice-recognition-grammar-files branch from ed3dc4b to 2027983 Compare August 19, 2015 23:33
@MageKing17
Copy link
Member Author

Trying this again; 2010 and 2012 projects still have the directory moved, but don't set FS2_SPEECH/FS2_VOICER by default. Also leaves gc.exe just so that 2010 Express (at least, I think that's what AppVeyor is using), which apparently lacks SAPI, can still compile phrases.xml.

@z64555 z64555 added the cleanup A modification or rewrite of code to make it more understandable or easier to maintain. label Aug 20, 2015
@chief1983
Copy link
Member

Looks good to me, after some discussion on IRC any concerns I had were alleviated.

chief1983 added a commit that referenced this pull request Aug 21, 2015
…n-grammar-files

Move the temporary grammar files into the build directory.
@chief1983 chief1983 merged commit f824df0 into scp-fs2open:master Aug 21, 2015
@MageKing17 MageKing17 deleted the cleanup/move-voice-recognition-grammar-files branch August 21, 2015 03:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cleanup A modification or rewrite of code to make it more understandable or easier to maintain.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants