Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
angle
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
angle
Commits
876f47ad
Commit
876f47ad
authored
Oct 12, 2011
by
daniel@transgaming.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix essl_to_hlsl project configurations
Bug=226 Author: Mark Callow git-svn-id:
https://angleproject.googlecode.com/svn/trunk@789
736b8ea6-26fd-11df-bfd4-992fa37f6226
parent
eef0e27c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
build_samples.gyp
samples/build_samples.gyp
+8
-0
essl_to_hlsl.vcproj
samples/translator/essl_to_hlsl.vcproj
+4
-2
version.h
src/common/version.h
+1
-1
No files found.
samples/build_samples.gyp
View file @
876f47ad
...
...
@@ -25,10 +25,18 @@
],
'include_dirs': [
'../include',
'../src',
],
'sources': [
'translator/translator.cpp',
'../src/common/debug.cpp',
],
'msvs_settings': {
'VCLinkerTool': {
'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
'AdditionalDependencies': ['d3d9.lib'],
}
}
},
],
'conditions': [
...
...
samples/translator/essl_to_hlsl.vcproj
View file @
876f47ad
...
...
@@ -41,7 +41,7 @@
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
"../../include"
AdditionalIncludeDirectories=
"../../include
;../../src
"
PreprocessorDefinitions=
"WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild=
"true"
BasicRuntimeChecks=
"3"
...
...
@@ -61,6 +61,7 @@
/>
<Tool
Name=
"VCLinkerTool"
AdditionalDependencies=
"d3d9.lib"
LinkIncremental=
"2"
GenerateDebugInformation=
"true"
SubSystem=
"1"
...
...
@@ -115,7 +116,7 @@
Name=
"VCCLCompilerTool"
Optimization=
"2"
EnableIntrinsicFunctions=
"true"
AdditionalIncludeDirectories=
"../../include"
AdditionalIncludeDirectories=
"../../include
;../../src
"
PreprocessorDefinitions=
"WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"true"
...
...
@@ -134,6 +135,7 @@
/>
<Tool
Name=
"VCLinkerTool"
AdditionalDependencies=
"d3d9.lib"
LinkIncremental=
"1"
GenerateDebugInformation=
"true"
SubSystem=
"1"
...
...
src/common/version.h
View file @
876f47ad
#define MAJOR_VERSION 0
#define MINOR_VERSION 0
#define BUILD_VERSION 0
#define BUILD_REVISION 78
8
#define BUILD_REVISION 78
9
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment