DPF

commit a296a76c708abd089ea589643f6623bde9c0ced8
parent 189de4e0269655463a6a0ff895e3d73914e6938b
Author: falkTX <falktx@gmail.com>
Date:   Mon, 27 Jan 2014 00:16:11 +0000

Fix win32 build; misc changes

Diffstat:
M
dgl/src/pugl/pugl_win.cpp
 | 
8
+-------
M
examples/Makefile
 | 
23
+++++++++++++----------

2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/dgl/src/pugl/pugl_win.cpp b/dgl/src/pugl/pugl_win.cpp
@@ -291,17 +291,11 @@ handleMessage(PuglView* view, UINT message, WPARAM wParam, LPARAM lParam)
 		processMouseEvent(view, 3, false, lParam);
 		break;
 	case WM_MOUSEWHEEL:
-		if (view->scrollFunc) {
-			view->scrollFunc(
-				view, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam),
-				(int16_t)HIWORD(wParam) / (float)WHEEL_DELTA);
-		}
-		break;
 	case WM_MOUSEHWHEEL:
 		if (view->scrollFunc) {
 			view->scrollFunc(
 				view, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam),
-				(int16_t)HIWORD(wParam) / float(WHEEL_DELTA), 0);
+				(int16_t)HIWORD(wParam) / (float)WHEEL_DELTA, 0);
 		}
 		break;
 	case WM_KEYDOWN:
diff --git a/examples/Makefile b/examples/Makefile
@@ -14,7 +14,7 @@ LINK_FLAGS      += -L.. -ldgl $(DGL_LIBS)
 # --------------------------------------------------------------
 
 ifeq ($(WIN32),true)
-TARGETS = app.exe cairo.exe color images.exe nekobi-ui.exe
+TARGETS = app.exe color.exe images.exe nekobi-ui.exe
 else
 ifeq ($(MACOS),true)
 TARGETS = app color images nekobi-ui
@@ -26,10 +26,20 @@ endif
 # --------------------------------------------------------------
 
 all: ../libdgl.a $(TARGETS)
+
+clean:
+	$(MAKE) -C ../dgl clean
+	$(RM) $(TARGETS)
+
+debug:
+	$(MAKE) DEBUG=true
+
 # --------------------------------------------------------------
 
 %.exe: %
+	rm -f $*.exe
 	mv $* $*.exe
+	ln -sf $*.exe $*
 
 ../libdgl.a: .FORCE
 	$(MAKE) -C ../dgl
@@ -53,14 +63,7 @@ nekobi-ui: nekobi-ui.cpp nekobi-ui_src/* ../dgl/*
 
 # --------------------------------------------------------------
 
-clean:
-	$(MAKE) -C ../dgl clean
-	$(RM) $(TARGETS)
-
-debug:
-	$(MAKE) DEBUG=true
-
-# --------------------------------------------------------------
-
 .FORCE:
 .PHONY: .FORCE
+
+# --------------------------------------------------------------