projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "On state change, visuals now keep instance data" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-swig
/
Makefile.am
diff --git
a/plugins/dali-swig/Makefile.am
b/plugins/dali-swig/Makefile.am
old mode 100644
(file)
new mode 100755
(executable)
index
6b6966a
..
2f81c64
--- a/
plugins/dali-swig/Makefile.am
+++ b/
plugins/dali-swig/Makefile.am
@@
-23,8
+23,8
@@
if BUILD_MCS
all-local: libNDalic.so NDali.dll
all-local: libNDalic.so NDali.dll
-libNDalic.so: automatic/cpp/dali_wrap.o manual/cpp/keyboard_focus_manager_wrap.o manual/cpp/view-wrapper-impl-wrap.o manual/cpp/callbackbase_wrap.o
- g++ -shared automatic/cpp/dali_wrap.o manual/cpp/keyboard_focus_manager_wrap.o manual/cpp/view-wrapper-impl-wrap.o manual/cpp/callbackbase_wrap.o -o libNDalic.so $(DALICORE_LIBS) $(DALIADAPTOR_LIBS) $(DALITOOLKIT_LIBS)
+libNDalic.so: automatic/cpp/dali_wrap.o manual/cpp/keyboard_focus_manager_wrap.o manual/cpp/view-wrapper-impl-wrap.o manual/cpp/callbackbase_wrap.o
manual/cpp/devel-property-wrap.o
+ g++ -shared automatic/cpp/dali_wrap.o manual/cpp/keyboard_focus_manager_wrap.o manual/cpp/view-wrapper-impl-wrap.o manual/cpp/callbackbase_wrap.o
manual/cpp/devel-property-wrap.o
-o libNDalic.so $(DALICORE_LIBS) $(DALIADAPTOR_LIBS) $(DALITOOLKIT_LIBS)
automatic/cpp/dali_wrap.o: $(BUILT_SOURCES)
g++ -c -fpic $(CXXFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) automatic/cpp/dali_wrap.cpp -o automatic/cpp/dali_wrap.o
automatic/cpp/dali_wrap.o: $(BUILT_SOURCES)
g++ -c -fpic $(CXXFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) automatic/cpp/dali_wrap.cpp -o automatic/cpp/dali_wrap.o
@@
-38,14
+38,22
@@
manual/cpp/view-wrapper-impl-wrap.o: $(BUILT_SOURCES)
manual/cpp/callbackbase_wrap.o: $(BUILT_SOURCES)
g++ -c -fpic $(CXXFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) manual/cpp/callbackbase_wrap.cpp -o manual/cpp/callbackbase_wrap.o
manual/cpp/callbackbase_wrap.o: $(BUILT_SOURCES)
g++ -c -fpic $(CXXFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) manual/cpp/callbackbase_wrap.cpp -o manual/cpp/callbackbase_wrap.o
+manual/cpp/devel-property-wrap.o: $(BUILT_SOURCES)
+ g++ -c -fpic $(CXXFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) manual/cpp/devel-property-wrap.cpp -o manual/cpp/devel-property-wrap.o
+
NDali.dll: $(BUILT_SOURCES)
NDali.dll: $(BUILT_SOURCES)
- $(MCS) -nologo -target:library -out:NDali.dll automatic/csharp/*.cs manual/csharp/*.cs
+ $(MCS) -nologo -target:library -out:NDali.dll automatic/csharp/*.cs manual/csharp/*.cs
views/*.cs
check-local: examples/dali-test.exe \
examples/hello-world.exe \
examples/scroll-view.exe \
examples/custom-control.exe \
check-local: examples/dali-test.exe \
examples/hello-world.exe \
examples/scroll-view.exe \
examples/custom-control.exe \
- examples/spin-control.exe \
+ examples/date-picker.exe \
+ examples/control-dashboard.exe \
+ examples/date-picker-using-json.exe \
+ examples/json-loader.exe \
+ examples/user-alphafunction.exe \
+ examples/image-view.exe \
examples/libNDalic.so examples/NDali.dll
examples/%.exe: examples/%.cs
examples/libNDalic.so examples/NDali.dll
examples/%.exe: examples/%.cs
@@
-64,6
+72,7
@@
endif
# then call our property-wrapper to inject DALi property getters / setters
$(BUILT_SOURCES): SWIG/*.i
rm -f automatic/csharp/*.cs
# then call our property-wrapper to inject DALi property getters / setters
$(BUILT_SOURCES): SWIG/*.i
rm -f automatic/csharp/*.cs
+ mkdir -p automatic/csharp
$(SWIG) -csharp -c++ -outdir automatic/csharp \
$(DALI_CFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) -namespace Dali -o automatic/cpp/dali_wrap.cpp SWIG/dali.i
./property-wrapper.rb
$(SWIG) -csharp -c++ -outdir automatic/csharp \
$(DALI_CFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) -namespace Dali -o automatic/cpp/dali_wrap.cpp SWIG/dali.i
./property-wrapper.rb