소스 검색

Merge branch 'master', remote-tracking branch 'gokr/master'

Nicolas Petton 12 년 전
부모
커밋
9094e606fa
3개의 변경된 파일7개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      examples/webos/eris/Makefile
  2. 5 1
      examples/webos/hellojtalk/README
  3. 1 1
      examples/webos/hellojtalk/index.html

+ 1 - 1
examples/webos/eris/Makefile

@@ -6,7 +6,7 @@
 #
 PACKAGE  := amber.eris
 VERSION  := 0.0.1
-FLAGS    := -L COMPILER
+FLAGS    := -l Compiler
 
 IPK      := $(PACKAGE)_$(VERSION)_all.ipk
 FILE     := Program

+ 5 - 1
examples/webos/hellojtalk/README

@@ -1 +1,5 @@
-This is just a first kinda messy experiment with Enyo, doesn't do anything sensible.
+This is just a first kinda messy experiment with Enyo, doesn't do anything sensible. If you have Chromium installed and also the Enyo framework accessible in your home directory as it is referenced in index.html - then you could probably do:
+
+	make chromium
+
+...to start the app in Chromium.

+ 1 - 1
examples/webos/hellojtalk/index.html

@@ -2,7 +2,7 @@
 <html>
 <head>
 	<title>Enyo Jtalk HelloWorld</title>
-	<script src="../../../enyo/1.0/framework/enyo.js" type="text/javascript"></script>
+	<script src="../../../../enyo/1.0/framework/enyo.js" type="text/javascript"></script>
 </head>
 <body>
 <script type="text/javascript">