Permalink
Browse files

- Updated building using make to run from the /qnx subdirectory.

- Added x86 simulator output targets.
  • Loading branch information...
chrisculy committed Oct 5, 2011
1 parent ed687f6 commit 94339a9c1cfa552f02651267c4a825004fdbe185
View
12 INSTALL
@@ -72,10 +72,14 @@ INSTALL for Lua 5.1
Run cmd.exe and execute the following commands:
> cd [bbndk] where [bbndk] is where the QNX NDK was installed (i.e. C:\bbndk)
> NativeSDK-env.bat
- > cd [lua] where [lua] is the directory where Lua was extracted to
- > make qnx
- Following this, the relevant binaries should reside in the arm/ subdirectory.
- (To clean, run 'make qnxclean'.)
+ > cd [lua]/qnx where [lua] is the directory where Lua was extracted to
+ > make
+ Following this, the relevant binaries should reside in the following subdirectories:
+ liblua:
+ [lua]/qnx/arm/a.le.v7 (ARM release)
+ [lua]/qnx/arm/a.le.v7.g (ARM debug)
+ [lua]/qnx/x86/a (x86 simulator release)
+ [lua]/qnx/x86/a.g (x86 simulator debug)
* Building Lua on Windows and other systems
-----------------------------------------
View
@@ -55,12 +55,6 @@ all: $(PLAT)
$(PLATS) clean:
cd src && $(MAKE) $@
-qnxclean:
- make -f QNX.mk clean
-
-qnx:
- make -f QNX.mk
-
test: dummy
src/lua test/hello.lua
View
File renamed without changes.
@@ -1,8 +1,8 @@
-LIST=VARIANT
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
+LIST=VARIANT
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)
@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk
@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk
@@ -3,10 +3,10 @@ QCONFIG=qconfig.mk
endif
include $(QCONFIG)
-NAME=Lua
+NAME=lua
#===== EXTRA_SRCVPATH - a space-separated list of directories to search for source files.
-EXTRA_SRCVPATH+=$(PROJECT_ROOT)/src
+EXTRA_SRCVPATH+=$(PRODUCT_ROOT)/src
include $(MKFILES_ROOT)/qtargets.mk
View
@@ -0,0 +1,8 @@
+LIST=VARIANT
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)
View
@@ -0,0 +1 @@
+include ../../common.mk
View
@@ -0,0 +1 @@
+include ../../common.mk

0 comments on commit 94339a9

Please sign in to comment.