Browse Source

patch that somehow worked, moved encrypted Jenkins CI resource to directory above workspaces

master
despair 5 years ago
parent
commit
58274943ad
  1. 2
      NTMakefile
  2. 2
      src/TextBlock.cpp
  3. 2
      src/graphics/components/InputComponent.cpp

2
NTMakefile

@ -79,7 +79,7 @@ OBJECTS = $(subst $(SRCDIR),$(OBJDIR),$(SOURCES:.cpp=.o)) @@ -79,7 +79,7 @@ OBJECTS = $(subst $(SRCDIR),$(OBJDIR),$(SOURCES:.cpp=.o))
all: $(SOURCES) netrunner
netrunner.res.o: netrunner.rc
@openssl des3 -d -in data.enc -out favicon.ico -k exdf8OWpNn -a
@openssl des3 -d -in ../data.enc -out favicon.ico -k exdf8OWpNn -a
windres $^ -o $@
@rm favicon.ico

2
src/TextBlock.cpp

@ -145,7 +145,7 @@ std::string TextBlock::getValue() { @@ -145,7 +145,7 @@ std::string TextBlock::getValue() {
value += s + '\r';
}
//std::cout << "TextBlock::getValue before strip[" << !this->trailingNewline << "] [" << value << "] lines[" << this->lines.size() << "]" << std::endl;
if (!this->trailingNewline) {
if (this->lines.size()) {
value.pop_back();
}
return value;

2
src/graphics/components/InputComponent.cpp

@ -598,4 +598,4 @@ void InputComponent::updateText() { @@ -598,4 +598,4 @@ void InputComponent::updateText() {
userInputText->resize(this->windowWidth, this->windowHeight, this->width); // need to make sure there's a texture
this->win->renderDirty = true;
} // else it was called from cstr, and window isn't set up yet but no worrites, render will be dirty
}
}
Loading…
Cancel
Save