aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-03-18 00:02:44 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2014-03-18 00:02:44 +0200
commitc3794e003f42cacca64833a6824980847b28a05e (patch)
tree2b355c4fec75e1e10d34480f131a79b66c3a6050
parente5ff0e12a4887e3bd9ac06819b017930a22ae2bc (diff)
downloadmeson-c3794e003f42cacca64833a6824980847b28a05e.zip
meson-c3794e003f42cacca64833a6824980847b28a05e.tar.gz
meson-c3794e003f42cacca64833a6824980847b28a05e.tar.bz2
Some fixes but not yet working.
-rw-r--r--backends.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/backends.py b/backends.py
index 69c225e..d64a307 100644
--- a/backends.py
+++ b/backends.py
@@ -1293,7 +1293,7 @@ class Vs2010Backend(Backend):
kw = ET.SubElement(globalgroup, 'Keyword')
kw.text = 'Win32Proj'
ns = ET.SubElement(globalgroup, 'RootNamespace')
- ns.text = 'Sample'
+ ns.text = target_name
p = ET.SubElement(globalgroup, 'Platform')
p.text= platform
pname= ET.SubElement(globalgroup, 'ProjectName')
@@ -1303,7 +1303,7 @@ class Vs2010Backend(Backend):
ET.SubElement(type_config, 'ConfigurationType').text = 'Application'
ET.SubElement(type_config, 'CharacterSet').text = 'MultiByte'
ET.SubElement(type_config, 'WholeProgramOptimization').text = 'false'
- ET.SubElement(type_config, 'UseDebugLibraries').text = 'false'
+ ET.SubElement(type_config, 'UseDebugLibraries').text = 'true'
ET.SubElement(root, 'Import', Project='$(VCTargetsPath)\Microsoft.Cpp.props')
direlem = ET.SubElement(root, 'PropertyGroup')
fver = ET.SubElement(direlem, '_ProjectFileVersion')
@@ -1314,7 +1314,7 @@ class Vs2010Backend(Backend):
else:
outdir.text = target.subdir + '\\'
intdir = ET.SubElement(direlem, 'IntDir')
- intdir.text = self.get_target_private_dir(target) + '\\'
+ intdir.text = os.path.join(self.get_target_dir(target), target.get_basename() + '.dir') + '\\'
tname = ET.SubElement(direlem, 'TargetName')
tname.text = target_name
inclinc = ET.SubElement(direlem, 'LinkIncremental')
@@ -1341,7 +1341,6 @@ class Vs2010Backend(Backend):
link = ET.SubElement(compiles, 'Link')
ofile = ET.SubElement(link, 'OutputFile')
ofile.text = '$(OutDir)%s' % target.get_filename()
- print(target.get_filename())
addlibdir = ET.SubElement(link, 'AdditionalLibraryDirectories')
addlibdir.text = '%(AdditionalLibraryDirectories)'
subsys = ET.SubElement(link, 'SubSystem')
@@ -1349,7 +1348,7 @@ class Vs2010Backend(Backend):
gendeb = ET.SubElement(link, 'GenerateDebugInformation')
gendeb.text = 'true'
pdb = ET.SubElement(link, 'ProgramDataBaseFileName')
- pdb.text = '$(OutDir}prog.pdb'
+ pdb.text = '$(OutDir}%s.pdb' % target_name
entrypoint = ET.SubElement(link, 'EntryPointSymbol')
entrypoint.text = 'mainCRTStartup'
targetmachine = ET.SubElement(link, 'TargetMachine')