Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Properly link to Core and Engine on Windows.

  • Loading branch information...
commit b8c74a233e77021cccf76b4e5974a5e73c37a9ec 1 parent c1ebbd3
Stéphan Kochen authored
Showing with 29 additions and 4 deletions.
  1. +15 −2 Core/package.gyp
  2. +14 −2 Engine/package.gyp
17 Core/package.gyp
View
@@ -11,9 +11,22 @@
"all_dependent_settings": {
"include_dirs": [ "Inc" ]
},
+
"direct_dependent_settings": {
- "libraries": [
- "-lCore"
+ "conditions": [
+ ["OS == 'linux'", {
+ "libraries": [ "-lCore" ]
+ }],
+ ["OS == 'win'", {
+ "libraries": [ "-lCore.lib" ],
+ "msvs_settings": {
+ "VCLinkerTool": {
+ "AdditionalLibraryDirectories": [
+ ">(DEPTH)/Core/Lib"
+ ]
+ }
+ }
+ }]
]
}
}
16 Engine/package.gyp
View
@@ -12,8 +12,20 @@
"include_dirs": [ "Inc" ]
},
"direct_dependent_settings": {
- "libraries": [
- "-lEngine"
+ "conditions": [
+ ["OS == 'linux'", {
+ "libraries": [ "-lEngine" ]
+ }],
+ ["OS == 'win'", {
+ "libraries": [ "-lEngine.lib" ],
+ "msvs_settings": {
+ "VCLinkerTool": {
+ "AdditionalLibraryDirectories": [
+ ">(DEPTH)/Engine/Lib"
+ ]
+ }
+ }
+ }]
]
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.