Browse Source

Strip Rack in `make dist`, set gTempWidget to NULL after using

tags/v0.6.0
Andrew Belt 7 years ago
parent
commit
8249edfcee
2 changed files with 7 additions and 3 deletions
  1. +4
    -3
      Makefile
  2. +3
    -0
      src/window.cpp

+ 4
- 3
Makefile View File

@@ -141,8 +141,8 @@ endif
ifeq ($(ARCH), win) ifeq ($(ARCH), win)
mkdir -p dist/Rack mkdir -p dist/Rack
cp -R LICENSE* res dist/Rack/ cp -R LICENSE* res dist/Rack/
cp Rack.exe dist/Rack/
strip dist/Rack/Rack.exe
cp $(TARGET) dist/Rack/
strip dist/Rack/$(TARGET)
cp /mingw64/bin/libwinpthread-1.dll dist/Rack/ cp /mingw64/bin/libwinpthread-1.dll dist/Rack/
cp /mingw64/bin/zlib1.dll dist/Rack/ cp /mingw64/bin/zlib1.dll dist/Rack/
cp /mingw64/bin/libstdc++-6.dll dist/Rack/ cp /mingw64/bin/libstdc++-6.dll dist/Rack/
@@ -168,7 +168,8 @@ endif
ifeq ($(ARCH), lin) ifeq ($(ARCH), lin)
mkdir -p dist/Rack mkdir -p dist/Rack
cp -R LICENSE* res dist/Rack/ cp -R LICENSE* res dist/Rack/
cp Rack Rack.sh dist/Rack/
cp $(TARGET) Rack.sh dist/Rack/
strip dist/Rack/$(TARGET)
cp dep/lib/libspeexdsp.so dist/Rack/ cp dep/lib/libspeexdsp.so dist/Rack/
cp dep/lib/libjansson.so.4 dist/Rack/ cp dep/lib/libjansson.so.4 dist/Rack/
cp dep/lib/libGLEW.so.2.1 dist/Rack/ cp dep/lib/libGLEW.so.2.1 dist/Rack/


+ 3
- 0
src/window.cpp View File

@@ -94,6 +94,7 @@ void mouseButtonCallback(GLFWwindow *window, int button, int action, int mods) {
} }
} }
} }
gTempWidget = NULL;
} }
else if (action == GLFW_RELEASE) { else if (action == GLFW_RELEASE) {
// onMouseUp // onMouseUp
@@ -122,6 +123,7 @@ void mouseButtonCallback(GLFWwindow *window, int button, int action, int mods) {
gDraggedWidget = NULL; gDraggedWidget = NULL;
gDragHoveredWidget = NULL; gDragHoveredWidget = NULL;
} }
gTempWidget = NULL;
} }
} }


@@ -214,6 +216,7 @@ void cursorPosCallback(GLFWwindow* window, double xpos, double ypos) {
} }
} }
} }
gTempWidget = NULL;
if (glfwGetMouseButton(gWindow, GLFW_MOUSE_BUTTON_MIDDLE) == GLFW_PRESS) { if (glfwGetMouseButton(gWindow, GLFW_MOUSE_BUTTON_MIDDLE) == GLFW_PRESS) {
// TODO // TODO
// Define a new global called gScrollWidget, which remembers the widget where middle-click was first pressed // Define a new global called gScrollWidget, which remembers the widget where middle-click was first pressed


Loading…
Cancel
Save