Merge

Merge in changes by Tom Tanner
Fixed Scons build for existing bits.
2026-07-27 14:02:39 -07:00 · 2015-05-09 21:46:40 +02:00 · 2015-03-27 18:24:37 +01:00 · 2015-03-20 10:34:30 +00:00 · 2015-03-18 17:40:29 +00:00 · 2015-03-18 14:16:04 +00:00
2 changed files with 17 additions and 1 deletions
@@ -0,0 +1,15 @@
+Import('qt_env')
+
+env = qt_env.Clone()
+
+env.DisableQtModules('Gui')
+env.AppendUnique(CPPDEFINES = [ 'INSTALLERBUNDLE_LIBRARY' ])
+
+# Sigh
+env['CPPPATH'] += [ '.' ]
+
+lib = env.SharedLibrary('installerBundle', env.Glob('*.cpp'))
+env.InstallModule(lib)
+
+res = env['QT_USED_MODULES']
+Return('res')
@@ -27,4 +27,5 @@ HEADERS += installerbundle.h
 include(../plugin_template.pri)

 OTHER_FILES += \
-    installerbundle.json
+    installerbundle.json\
+    SConscript
Author	SHA1	Message	Date
Tannin	4b1dd8fb81	Merge	2015-05-09 21:46:40 +02:00
Tannin	17c3bc3450	Merge in changes by Tom Tanner	2015-03-27 18:24:37 +01:00
Tom Tanner	8f9b8cf564	Fixed Scons build for existing bits. Changed pynedit.pro to fetch from 'standard' install location Changed saveas code to use organizer report rather than uibase - this way it's not dependant on the vagaries of the include path, and works the same as the rest of the organiser directory	2015-03-20 10:34:30 +00:00
Tom Tanner	6ef78cf305	Merge with branch1.2	2015-03-18 17:40:29 +00:00
Tom Tanner	729a2d2856	Refactoring and cleanup.	2015-03-18 14:16:04 +00:00
Tom Tanner	dc7d96ec8e	Every plugin now built	2015-03-17 16:31:15 +00:00
Tannin	6797d50370	Merge with branch1.2	2015-01-03 15:58:52 +01:00