Permalink
Browse files

QJson is statically linked.

  • Loading branch information...
1 parent cb2c8d6 commit 52b80c3fc9dcd2e540db3eecd9c6c9b58d413ac4 @minimoog committed May 31, 2011
View
@@ -1,10 +1,6 @@
TEMPLATE = subdirs
-SUBDIRS = sub_qjson sub_src sub_examples
-
-sub_qjson.subdir = qjson
+SUBDIRS = sub_src sub_examples
sub_src.subdir = src
-sub_src.depends = sub_qjson
sub_examples.subdir = examples
-sub_examples.depends = sub_src
View
@@ -1,34 +0,0 @@
-TEMPLATE = lib
-QT -= gui
-TARGET = qjson
-DESTDIR = ../lib
-CONFIG += create_prl
-
-windows: {
- DEFINES += QJSON_MAKEDLL
-}
-
-HEADERS += \
- stack.hh \
- serializerrunnable.h \
- serializer.h \
- qobjecthelper.h \
- qjson_export.h \
- qjson_debug.h \
- position.hh \
- parserrunnable.h \
- parser_p.h \
- parser.h \
- location.hh \
- json_scanner.h \
- json_parser.hh \
-
-SOURCES += \
- serializerrunnable.cpp \
- serializer.cpp \
- qobjecthelper.cpp \
- parserrunnable.cpp \
- parser.cpp \
- json_scanner.cpp \
- json_parser.cc \
-
View
@@ -1,70 +0,0 @@
-QJSON_BASE = ..
-QJSON_SRCBASE = .
-
-TEMPLATE = lib
-QT -= gui
-TARGET = qjson
-DESTDIR = $$QJSON_BASE/lib
-CONFIG += create_prl
-
-VERSION = 0.7.1
-
-windows: {
- DEFINES += QJSON_MAKEDLL
-}
-
-QJSON_CPP = $$QJSON_SRCBASE
-INCLUDEPATH += $$QJSON_CPP
-
-PRIVATE_HEADERS += \
- json_parser.hh \
- json_scanner.h \
- location.hh \
- parser_p.h \
- position.hh \
- qjson_debug.h \
- stack.hh
-
-PUBLIC_HEADERS += \
- parser.h \
- parserrunnable.h \
- qobjecthelper.h \
- serializer.h \
- serializerrunnable.h \
- qjson_export.h
-
-HEADERS += $$PRIVATE_HEADERS $$PUBLIC_HEADERS
-
-SOURCES += \
- json_parser.cc \
- json_scanner.cpp \
- parser.cpp \
- parserrunnable.cpp \
- qobjecthelper.cpp \
- serializer.cpp \
- serializerrunnable.cpp
-
-symbian: {
- DEFINES += QJSON_MAKEDLL
- #export public header to \epocroot\epoc32\include to be able to use them
- headers.files = $$PUBLIC_HEADERS
- headers.path = $$PWD
- for(header, headers.files) {
- {BLD_INF_RULES.prj_exports += "$$header"}
- }
-
- TARGET.EPOCALLOWDLLDATA = 1
- # uid for the dll
- #TARGET.UID3=
- TARGET.CAPABILITY = ReadDeviceData WriteDeviceData
-
- # do not freeze api-> no libs produced. Comment when freezing!
- # run "abld freeze winscw" to create def files
- symbian:MMP_RULES += "EXPORTUNFROZEN"
-
- # add dll to the sis
- QjsonDeployment.sources = $${TARGET}.dll
- QjsonDeployment.path = /sys/bin
-
- DEPLOYMENT += QjsonDeployment
-}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -22,14 +22,14 @@
#include <QtCore/qglobal.h>
-#ifndef QJSON_EXPORT
-# if defined(QJSON_MAKEDLL)
- /* We are building this library */
-# define QJSON_EXPORT Q_DECL_EXPORT
-# else
- /* We are using this library */
-# define QJSON_EXPORT Q_DECL_IMPORT
-# endif
-#endif
+//#ifndef QJSON_EXPORT
+//# if defined(QJSON_MAKEDLL)
+// /* We are building this library */
+#define QJSON_EXPORT
+//# else
+// /* We are using this library */
+//# define QJSON_EXPORT Q_DECL_IMPORT
+//# endif
+//#endif
#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -2,10 +2,8 @@ QT += network
QT += gui
TEMPLATE = lib
-TARGET = QTweetLib
+TARGET = qtweetlib
DESTDIR = ../lib
-win32:LIBS += ../lib/qjson.lib
-unix:LIBS += -L../lib -lqjson
CONFIG += create_prl
INCLUDEPATH += ..
@@ -86,7 +84,20 @@ HEADERS += \
qtweetblocksdestroy.h \
qtweetblocksexists.h \
qtweetblocksblocking.h \
- qtweetblocksblockingids.h
+ qtweetblocksblockingids.h \
+ qjson/stack.hh \
+ qjson/serializerrunnable.h \
+ qjson/serializer.h \
+ qjson/qobjecthelper.h \
+ qjson/qjson_export.h \
+ qjson/qjson_debug.h \
+ qjson/position.hh \
+ qjson/parserrunnable.h \
+ qjson/parser_p.h \
+ qjson/parser.h \
+ qjson/location.hh \
+ qjson/json_scanner.h \
+ qjson/json_parser.hh
SOURCES += \
oauth.cpp \
@@ -160,4 +171,14 @@ SOURCES += \
qtweetblocksdestroy.cpp \
qtweetblocksexists.cpp \
qtweetblocksblocking.cpp \
- qtweetblocksblockingids.cpp
+ qtweetblocksblockingids.cpp \
+ qjson/serializerrunnable.cpp \
+ qjson/serializer.cpp \
+ qjson/qobjecthelper.cpp \
+ qjson/parserrunnable.cpp \
+ qjson/parser.cpp \
+ qjson/json_scanner.cpp \
+ qjson/json_parser.cc
+
+OTHER_FILES += \
+ qjson/json_parser.yy

0 comments on commit 52b80c3

Please sign in to comment.