create win-dlls; refs #115

master
Marc Wäckerlin 12 years ago
parent 10d492121a
commit ecdfe066e8
  1. 2
      src/designer/makefile.am
  2. 2
      src/designer/qmake.pro.in
  3. 2
      src/makefile.am
  4. 6
      src/qbrowserlib/makefile.am
  5. 6
      src/qbrowserlib/qmake.pro.in

@ -89,6 +89,6 @@ clean-local:
# $(LANGS:%=@PACKAGENAME@_%.qm)
CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} \
*.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \
*.o *.obj qrc_*.cpp ui_*.h moc_*.cpp *.dll \
${QMAKE_TARGET:%=lib%*}
MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE}

@ -27,7 +27,7 @@ macx {
win32 {
QMAKE_LIBS += -lwinhttp -lgdi32 -lws2_32
QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a
CONFIG += release
CONFIG += release dll
}
FORMS =

@ -89,6 +89,6 @@ clean-local:
CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=@PACKAGENAME@_%.qm) \
*.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \
${QMAKE_TARGET} \
${QMAKE_TARGET} object_script.swissbrowser \
@PACKAGENAME@.xpm
MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE}

@ -18,11 +18,11 @@ else
endif
endif
EXTRA_DIST = @srcdir@/*.[ch]xx @srcdir@/*.ui @srcdir@/*.ts @srcdir@/*.qrc.in
EXTRA_DIST = @srcdir@/*.[ch]xx @srcdir@/*.ui @srcdir@/*.ts @srcdir@/languages.qrc.in
LANGS = en de fr it
ALL_SRC = @srcdir@/*.[ch]xx \
*.qrc \
languages.qrc \
@srcdir@/*.ui
QMAKE_PROJECT = @srcdir@/qmake.pro
@ -86,6 +86,6 @@ clean-local:
-rm -r ${QMAKE_TARGET}*
CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=qbrowserlib_%.qm) \
*.o *.obj qrc_*.cpp ui_*.h moc_*.cpp *.qrc \
*.o *.obj qrc_*.cpp ui_*.h moc_*.cpp *.qrc *.dll \
${QMAKE_TARGET} \
MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE}

@ -2,9 +2,7 @@ QT += webkit network gui
QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto
QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter
#-std=c++0x
QMAKE_INCDIR += BULLSHIT1 @srcdir@/.. BULLSHIT2 .. BULLSHIT3
INCLUDEPATH += BULLSHIT4 .. BULLSHIT5
QMAKE_CXXFLAGS += -IBULLSHIT6 -I.. -IBULLSHIT7
QMAKE_INCDIR += @srcdir@/.. ..
unix {
!macx {
@ -26,7 +24,7 @@ macx {
win32 {
QMAKE_LIBS += -lwinhttp -lgdi32 -lws2_32
QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a
CONFIG += release
CONFIG += release dll
}
ICON = swissbrowser.icns

Loading…
Cancel
Save