From 74f2f47cb63b02638270beecd20acea1a0f5665e Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Wed, 27 Sep 2017 11:17:39 -0700 Subject: First attempt at a Linux build (#193) * First attempt at a Linux build - Fix up places where C++ idioms were written assuming lenient behavior of Microsoft's compiler - Add a few more alternatives for platform-specific behavior where Windows was the only platform accounted for. - Add a basic Makefile that can at least invoke our build, even if it isn't going good dependency tracking, etc. - Build `libslang.so` and `slangc` that depends on it, using a relative `RPATH` to make the binary portable (I hope) - Add an initial `.travis.yml` to see if we can trigger their build process. * Fixup: const bug in `List::Sort` I'm not clear why this gets picked up by the gcc *and* clang that Travis uses, but not the (newer) gcc I'm using on Ubuntu here, but I'm hoping it is just some missing `const` qualifiers. * Fixup: reorder specialization of "class info" Clang complains about things being specialized after being instantiated (implicilty), and I hope it is just the fact that I generate the class info for the roots of the hierarchy after the other cases. We'll see. * Fixup: add `platform.cpp` to unified/lumped build * Fixup: Windows uses `FreeLibrary` and not `UnloadLibrary` * Fixup: fix Windows project file to include new source file This obviously points to the fact that we are going to need to be generating these files sooner or later. --- source/slang/emit.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/slang/emit.cpp') diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp index 26b3b925b..d4c1be706 100644 --- a/source/slang/emit.cpp +++ b/source/slang/emit.cpp @@ -488,7 +488,7 @@ struct EmitVisitor void Emit(IntegerLiteralValue value) { char buffer[32]; - sprintf(buffer, "%lld", value); + sprintf(buffer, "%lld", (long long int)value); Emit(buffer); } @@ -823,7 +823,7 @@ struct EmitVisitor { if(auto basicElementType = type->As()) { - switch (basicElementType->BaseType) + switch (basicElementType->baseType) { case BaseType::Float: // no prefix @@ -1043,7 +1043,7 @@ struct EmitVisitor void visitBasicExpressionType(BasicExpressionType* basicType, TypeEmitArg const& arg) { auto declarator = arg.declarator; - switch (basicType->BaseType) + switch (basicType->baseType) { case BaseType::Void: Emit("void"); break; case BaseType::Int: Emit("int"); break; @@ -1208,7 +1208,7 @@ struct EmitVisitor } - emitTypeImpl(arrayType->BaseType, &arrayDeclarator); + emitTypeImpl(arrayType->baseType, &arrayDeclarator); } void EmitType( -- cgit v1.2.3