Browse Source

Add fatal error if res is not found.

tags/v1.0.0
Andrew Belt 5 years ago
parent
commit
dd55681546
2 changed files with 7 additions and 7 deletions
  1. +0
    -7
      Makefile
  2. +7
    -0
      src/main.cpp

+ 0
- 7
Makefile View File

@@ -103,8 +103,6 @@ ifdef ARCH_LIN
# Manually check that no nonstandard shared libraries are linked
ldd dist/Rack/$(TARGET)
cp plugins/Fundamental/dist/*.zip dist/Rack/Fundamental.zip
mkdir -p dist/Rack/Bridge
# cp Bridge/VST/dist/VCV-Bridge{,-fx}.so dist/Rack/Bridge/
# Make ZIP
cd dist && zip -5 -r Rack-$(VERSION)-$(ARCH).zip Rack
endif
@@ -123,9 +121,6 @@ ifdef ARCH_MAC
otool -L dist/$(TARGET).app/Contents/MacOS/$(TARGET)

cp plugins/Fundamental/dist/*.zip dist/$(TARGET).app/Contents/Resources/Fundamental.zip
# cp -R Bridge/AU/dist/VCV-Bridge.component dist/
# cp -R Bridge/VST/dist/VCV-Bridge.vst dist/
# cp -R Bridge/VST/dist/VCV-Bridge-fx.vst dist/
# Make ZIP
cd dist && zip -5 -r Rack-$(VERSION)-$(ARCH).zip $(TARGET).app
endif
@@ -138,8 +133,6 @@ ifdef ARCH_WIN
cp /mingw64/bin/libstdc++-6.dll dist/Rack/
cp /mingw64/bin/libgcc_s_seh-1.dll dist/Rack/
cp plugins/Fundamental/dist/*.zip dist/Rack/Fundamental.zip
# mkdir -p dist/Rack/Bridge
# cp Bridge/VST/dist/VCV-Bridge-{32,64,fx-32,fx-64}.dll dist/Rack/Bridge/
# Make ZIP
cd dist && zip -5 -r Rack-$(VERSION)-$(ARCH).zip Rack
# Make NSIS installer


+ 7
- 0
src/main.cpp View File

@@ -105,6 +105,13 @@ int main(int argc, char *argv[]) {
INFO("System directory: %s", asset::systemDir.c_str());
INFO("User directory: %s", asset::userDir.c_str());

std::string resDir = asset::system("res");
if (!system::isDirectory(resDir)) {
std::string message = string::f("Rack's resource directory \"%s\" does not exist. Make sure Rack is correctly installed and launched.", resDir.c_str());
osdialog_message(OSDIALOG_ERROR, OSDIALOG_OK, message.c_str());
exit(1);
}

INFO("Initializing environment");
random::init();
midi::init();


Loading…
Cancel
Save