Skip to content

Commit

Permalink
fix windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
WrongPeople committed Aug 8, 2019
1 parent 707f97e commit ac3a82d
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ SOURCES += $(filter-out dep/midifile/src/Options.cpp, $(wildcard dep/midifile/sr

SOURCES += src/Tourette.cpp
SOURCES += src/MIDIPlayer.cpp
SOURCES += src/Lua.cpp
SOURCES += src/LuaModule.cpp

# Static libs
libluajit := dep/luajit/src/libluajit.a
Expand All @@ -31,7 +31,7 @@ OBJECTS += $(libluajit)
DEPS += $(libluajit)

$(libluajit):
cd dep/luajit && $(MAKE) CFLAGS="-fPIC"
cd dep/luajit && $(MAKE) BUILDMODE="static" CFLAGS="-fPIC"

# Add files to the ZIP package when running `make dist`
# The compiled plugin and "plugin.json" are automatically added.
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@ Tourette syndrome simulator.
git clone https://github.com/WrongPeople/WrongPeopleVCV.git
cd WrongPeopleVCV
git submodule update --init --recursive
make dep
make
RACK_DIR=path/to/Rack-SDK make
```
2 changes: 1 addition & 1 deletion src/Lua.cpp → src/LuaModule.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Lua.hpp"
#include "LuaModule.hpp"
#include "components/Lua/LuaDisplay.hpp"


Expand Down
File renamed without changes.
3 changes: 1 addition & 2 deletions src/components/Lua/LuaDisplay.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "lua.hpp"
#include "../../LuaModule.hpp"


struct LuaDisplay : TransparentWidget {
Expand Down Expand Up @@ -30,7 +30,6 @@ struct LuaDisplay : TransparentWidget {
box.size = size;
this->module = module;
font = APP->window->loadFont(asset::plugin(pluginInstance, "res/fonts/ShareTechMono-Regular.ttf"));
// 150.000000 143.297241
valuesDisplay = Rect(7.f, 29.f, 105.f, 105.f);
scopeDisplay = Rect(0.f, 33.f, size.x, size.y - 47.f);
}
Expand Down
2 changes: 1 addition & 1 deletion src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bool systemIsDirectory(std::string path) {
struct stat statbuf;
if (stat(path.c_str(), &statbuf))
return false;
return S_ISDIR(statbuf.st_mode);
return statbuf.st_mode & S_IFDIR;
}

std::string timeToString(float seconds) {
Expand Down
3 changes: 1 addition & 2 deletions src/util.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "rack.hpp"

#include <string>
#include <sys/stat.h>


#if ARCH_WIN
Expand All @@ -14,8 +15,6 @@

#else

#include <sys/stat.h>

#define DIR_SEP "/"

#endif
Expand Down

0 comments on commit ac3a82d

Please sign in to comment.