Bläddra i källkod

CROWN_ARCH cmake var implemented

mikymod 12 år sedan
förälder
incheckning
5ed800d9b9
27 ändrade filer med 13 tillägg och 2 borttagningar
  1. 3 1
      BUILD.txt
  2. 10 1
      CMakeLists.txt
  3. 0 0
      third/x86_64/luajit/bin/luajit
  4. 0 0
      third/x86_64/luajit/bin/luajit-2.0.1
  5. 0 0
      third/x86_64/luajit/include/luajit-2.0/lauxlib.h
  6. 0 0
      third/x86_64/luajit/include/luajit-2.0/lua.h
  7. 0 0
      third/x86_64/luajit/include/luajit-2.0/lua.hpp
  8. 0 0
      third/x86_64/luajit/include/luajit-2.0/luaconf.h
  9. 0 0
      third/x86_64/luajit/include/luajit-2.0/luajit.h
  10. 0 0
      third/x86_64/luajit/include/luajit-2.0/lualib.h
  11. 0 0
      third/x86_64/luajit/lib/libluajit-5.1.a
  12. 0 0
      third/x86_64/luajit/lib/libluajit-5.1.so
  13. 0 0
      third/x86_64/luajit/lib/libluajit-5.1.so.2
  14. 0 0
      third/x86_64/luajit/lib/libluajit-5.1.so.2.0.1
  15. 0 0
      third/x86_64/luajit/lib/pkgconfig/luajit.pc
  16. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/bc.lua
  17. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/bcsave.lua
  18. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/dis_arm.lua
  19. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/dis_mips.lua
  20. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/dis_mipsel.lua
  21. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/dis_ppc.lua
  22. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/dis_x64.lua
  23. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/dis_x86.lua
  24. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/dump.lua
  25. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/v.lua
  26. 0 0
      third/x86_64/luajit/share/luajit-2.0.1/jit/vmdef.lua
  27. 0 0
      third/x86_64/luajit/share/man/man1/luajit.1

+ 3 - 1
BUILD.txt

@@ -5,10 +5,12 @@ Type these commands in the root directory (i.e. the same as this file):
 
 1. $ mkdir build
 2. $ cd build
-3. $ cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/your/install/directory
+3. $ cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/your/install/directory -DCROWN_ARCH="..."
 4. $ make
 5. $ make install
 
+N.B: CROWN_ARCH valid values right now: "x86", "x86_64"
+
 //-----------------------------------------------------------------------------
 In order to select different build configurations you have to do the following:
 

+ 10 - 1
CMakeLists.txt

@@ -33,7 +33,7 @@ set (INCLUDES
 )
 
 include_directories(${INCLUDES})
-add_definitions(-pipe -ansi -W -Wall -Wextra -Wno-long-long -pedantic -fPIC -g -pg)
+add_definitions(-pipe -ansi -W -Wall -Wextra -Wno-long-long -pedantic -fPIC -g -pg -llua)
 
 # detect operating system
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -69,5 +69,14 @@ if (CROWN_BUILD_TESTS)
 	add_subdirectory(tests)
 endif (CROWN_BUILD_TESTS)
 
+#detect architecture
+if (CROWN_ARCH MATCHES "x86")
+	add_subdirectory(third/x86);
+endif (CROWN_ARCH MATCHES "x86")
+
+if (CROWN_ARCH MATCHES "x86_64")
+	add_subdirectory(third/x86_64)
+endif (CROWN_ARCH MATCHES "x86_64")
+
 #add_subdirectory(third/luajit)
 

+ 0 - 0
third/luajit/x86_64/bin/luajit → third/x86_64/luajit/bin/luajit


+ 0 - 0
third/luajit/x86_64/bin/luajit-2.0.1 → third/x86_64/luajit/bin/luajit-2.0.1


+ 0 - 0
third/luajit/x86_64/include/luajit-2.0/lauxlib.h → third/x86_64/luajit/include/luajit-2.0/lauxlib.h


+ 0 - 0
third/luajit/x86_64/include/luajit-2.0/lua.h → third/x86_64/luajit/include/luajit-2.0/lua.h


+ 0 - 0
third/luajit/x86_64/include/luajit-2.0/lua.hpp → third/x86_64/luajit/include/luajit-2.0/lua.hpp


+ 0 - 0
third/luajit/x86_64/include/luajit-2.0/luaconf.h → third/x86_64/luajit/include/luajit-2.0/luaconf.h


+ 0 - 0
third/luajit/x86_64/include/luajit-2.0/luajit.h → third/x86_64/luajit/include/luajit-2.0/luajit.h


+ 0 - 0
third/luajit/x86_64/include/luajit-2.0/lualib.h → third/x86_64/luajit/include/luajit-2.0/lualib.h


+ 0 - 0
third/luajit/x86_64/lib/libluajit-5.1.a → third/x86_64/luajit/lib/libluajit-5.1.a


+ 0 - 0
third/luajit/x86_64/lib/libluajit-5.1.so → third/x86_64/luajit/lib/libluajit-5.1.so


+ 0 - 0
third/luajit/x86_64/lib/libluajit-5.1.so.2 → third/x86_64/luajit/lib/libluajit-5.1.so.2


+ 0 - 0
third/luajit/x86_64/lib/libluajit-5.1.so.2.0.1 → third/x86_64/luajit/lib/libluajit-5.1.so.2.0.1


+ 0 - 0
third/luajit/x86_64/lib/pkgconfig/luajit.pc → third/x86_64/luajit/lib/pkgconfig/luajit.pc


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/bc.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/bc.lua


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/bcsave.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/bcsave.lua


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/dis_arm.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/dis_arm.lua


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/dis_mips.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/dis_mips.lua


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/dis_mipsel.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/dis_mipsel.lua


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/dis_ppc.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/dis_ppc.lua


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/dis_x64.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/dis_x64.lua


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/dis_x86.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/dis_x86.lua


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/dump.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/dump.lua


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/v.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/v.lua


+ 0 - 0
third/luajit/x86_64/share/luajit-2.0.1/jit/vmdef.lua → third/x86_64/luajit/share/luajit-2.0.1/jit/vmdef.lua


+ 0 - 0
third/luajit/x86_64/share/man/man1/luajit.1 → third/x86_64/luajit/share/man/man1/luajit.1