Browse Source

Misc changes

tags/v0.9.0
falkTX 10 years ago
parent
commit
98f1374f66
4 changed files with 9 additions and 7 deletions
  1. +3
    -3
      Makefile
  2. +1
    -1
      c++/jackmeter/Makefile
  3. +1
    -1
      c++/xycontroller/Makefile
  4. +4
    -2
      src/shared_canvasjack.py

+ 3
- 3
Makefile View File

@@ -9,9 +9,9 @@ DESTDIR =

SED_PREFIX = $(shell echo $(PREFIX) | sed "s/\//\\\\\\\\\//g")

LINK = ln -s
PYUIC = pyuic4
PYRCC = pyrcc4 -py3
LINK = ln -s
PYUIC ?= pyuic4
PYRCC ?= pyrcc4 -py3

# Detect X11 rules dir
ifeq "$(wildcard /etc/X11/xinit/xinitrc.d/ )" ""


+ 1
- 1
c++/jackmeter/Makefile View File

@@ -34,7 +34,7 @@ cadence-jackmeter: $(FILES) $(OBJS)
$(CXX) $(OBJS) $(LINK_FLAGS) -o $@ && $(STRIP) $@

cadence-jackmeter.exe: $(FILES) $(OBJS) icon.o
$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -static -mwindows -o $@ && $(STRIP) $@
$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ && $(STRIP) $@

# --------------------------------------------------------------



+ 1
- 1
c++/xycontroller/Makefile View File

@@ -38,7 +38,7 @@ cadence-xycontroller: $(FILES) $(OBJS)
$(CXX) $(OBJS) $(LINK_FLAGS) -o $@ && $(STRIP) $@

cadence-xycontroller.exe: $(FILES) $(OBJS) icon.o
$(CXX) $(OBJS) icon.o -static -mwindows $(LINK_FLAGS) -o $@ && $(STRIP) $@
$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ && $(STRIP) $@

# --------------------------------------------------------------



+ 4
- 2
src/shared_canvasjack.py View File

@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-

# Common/Shared code related to Canvas and JACK
# Copyright (C) 2010-2012 Filipe Coelho <falktx@falktx.com>
# Copyright (C) 2010-2013 Filipe Coelho <falktx@falktx.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,7 +26,9 @@ from PyQt4.QtGui import QCursor, QFontMetrics, QImage, QMainWindow, QMenu, QPain
# Imports (Custom Stuff)

import patchcanvas
import jacksettings, logs, render
import jacksettings
import logs
import render
from shared import *
from jacklib_helpers import *



Loading…
Cancel
Save