Browse Source

Fix OSX and Windows build

gh-pages
falkTX 10 years ago
parent
commit
7a76d4b87a
2 changed files with 5 additions and 1 deletions
  1. +4
    -0
      dgl/Makefile
  2. +1
    -1
      dgl/src/Window.cpp

+ 4
- 0
dgl/Makefile View File

@@ -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:


+ 1
- 1
dgl/src/Window.cpp View File

@@ -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;


Loading…
Cancel
Save