DPF

commit 7a76d4b87ae1048398b56f6463cb891b5b508a78
parent f8670208e8281ee02d59b49f173096bbc8bd1031
Author: falkTX <falktx@gmail.com>
Date:   Tue, 24 Dec 2013 04:29:29 +0000

Fix OSX and Windows build

Diffstat:
M
dgl/Makefile
 | 
4
++++
M
dgl/src/Window.cpp
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/dgl/Makefile b/dgl/Makefile
@@ -43,6 +43,7 @@ all: $(TARGET)
 	$(AR) crs $@ $^
 
 ../libdgl.dll: $(OBJS)
+	# -Wl,--output-def,$@.def,--out-implib,$@.a
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 ../libdgl.dylib: $(OBJS)
@@ -56,6 +57,9 @@ all: $(TARGET)
 %.cpp.o: %.cpp
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
+%.m.o: %.m
+	$(CC) $< $(BUILD_C_FLAGS) -objc -c -o $@
+
 # --------------------------------------------------------------
 
 clean:
diff --git a/dgl/src/Window.cpp b/dgl/src/Window.cpp
@@ -436,7 +436,7 @@ public:
 
 #if DGL_OS_WINDOWS
         // Center this window
-        PuglInternals* const parentImpl = fParent->fView->impl;
+        PuglInternals* const parentImpl = fModal.parent->fView->impl;
 
         RECT curRect;
         RECT parentRect;