web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

create win-dlls; refs #115

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-02-28 08:44:34 +00:00
parent 10d492121a
commit ecdfe066e8
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/designer/makefile.am
View File

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

2
src/designer/qmake.pro.in
View File

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

2
src/makefile.am
View File

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

6
src/qbrowserlib/makefile.am
View File

@@ -18,11 +18,11 @@ else
endif endif
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 LANGS = en de fr it
ALL_SRC = @srcdir@/*.[ch]xx \ ALL_SRC = @srcdir@/*.[ch]xx \
*.qrc \ languages.qrc \
@srcdir@/*.ui @srcdir@/*.ui
QMAKE_PROJECT = @srcdir@/qmake.pro QMAKE_PROJECT = @srcdir@/qmake.pro
@@ -86,6 +86,6 @@ clean-local:
-rm -r ${QMAKE_TARGET}* -rm -r ${QMAKE_TARGET}*
CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=qbrowserlib_%.qm) \ 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} \ ${QMAKE_TARGET} \
MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE} MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE}

6
src/qbrowserlib/qmake.pro.in
View File

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