Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
NLua
Commits
d708a798
Commit
d708a798
authored
May 22, 2013
by
Megax
Browse files
* Makefile update and fix.
parent
b790718e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Applications/LuaRunner/LuaRunner.make
View file @
d708a798
...
@@ -18,11 +18,11 @@ LUARUNNER_EXE_CONFIG_SOURCE=app.config
...
@@ -18,11 +18,11 @@ LUARUNNER_EXE_CONFIG_SOURCE=app.config
NLUA_DLL_SOURCE
=
../../Run/Debug/NLua.dll
NLUA_DLL_SOURCE
=
../../Run/Debug/NLua.dll
NLUA_DLL_MDB_SOURCE
=
../../Run/Debug/NLua.dll.mdb
NLUA_DLL_MDB_SOURCE
=
../../Run/Debug/NLua.dll.mdb
NLUA_DLL_MDB
=
$(BUILD_DIR)
/NLua.dll.mdb
NLUA_DLL_MDB
=
$(BUILD_DIR)
/NLua.dll.mdb
KERALUA_DLL_SOURCE
=
../../Core/KeraLua/bin/Debug/KeraLua.dll
KERALUA_DLL_SOURCE
=
../../Core/KeraLua/
src/
bin/Debug/KeraLua.dll
KERALUA_DLL_MDB_SOURCE
=
../../Core/KeraLua/bin/Debug/KeraLua.dll.mdb
KERALUA_DLL_MDB_SOURCE
=
../../Core/KeraLua/
src/
bin/Debug/KeraLua.dll.mdb
KERALUA_DLL_MDB
=
$(BUILD_DIR)
/KeraLua.dll.mdb
KERALUA_DLL_MDB
=
$(BUILD_DIR)
/KeraLua.dll.mdb
KOPILUA_DLL_SOURCE
=
../../Core/KopiLua/
b
in/Debug/KopiLua.dll
KOPILUA_DLL_SOURCE
=
../../Core/KopiLua/
B
in/Debug/KopiLua.dll
KOPILUA_DLL_MDB_SOURCE
=
../../Core/KopiLua/
b
in/Debug/KopiLua.dll.mdb
KOPILUA_DLL_MDB_SOURCE
=
../../Core/KopiLua/
B
in/Debug/KopiLua.dll.mdb
KOPILUA_DLL_MDB
=
$(BUILD_DIR)
/KopiLua.dll.mdb
KOPILUA_DLL_MDB
=
$(BUILD_DIR)
/KopiLua.dll.mdb
endif
endif
...
@@ -41,9 +41,9 @@ LUARUNNER_EXE_MDB=
...
@@ -41,9 +41,9 @@ LUARUNNER_EXE_MDB=
LUARUNNER_EXE_CONFIG_SOURCE
=
app.config
LUARUNNER_EXE_CONFIG_SOURCE
=
app.config
NLUA_DLL_SOURCE
=
../../Run/Release/NLua.dll
NLUA_DLL_SOURCE
=
../../Run/Release/NLua.dll
NLUA_DLL_MDB
=
NLUA_DLL_MDB
=
KERALUA_DLL_SOURCE
=
../../Core/KeraLua/bin/Release/KeraLua.dll
KERALUA_DLL_SOURCE
=
../../Core/KeraLua/
src/
bin/Release/KeraLua.dll
KERALUA_DLL_MDB
=
KERALUA_DLL_MDB
=
KOPILUA_DLL_SOURCE
=
../../Core/KopiLua/
b
in/Release/KopiLua.dll
KOPILUA_DLL_SOURCE
=
../../Core/KopiLua/
B
in/Release/KopiLua.dll
KOPILUA_DLL_MDB
=
KOPILUA_DLL_MDB
=
endif
endif
...
...
ConsoleTest/Makefile.am
View file @
d708a798
...
@@ -19,11 +19,11 @@ CONSOLETEST_EXE_CONFIG_SOURCE=App.config
...
@@ -19,11 +19,11 @@ CONSOLETEST_EXE_CONFIG_SOURCE=App.config
NLUA_DLL_SOURCE
=
../Run/Debug/NLua.dll
NLUA_DLL_SOURCE
=
../Run/Debug/NLua.dll
NLUA_DLL_MDB_SOURCE
=
../Run/Debug/NLua.dll.mdb
NLUA_DLL_MDB_SOURCE
=
../Run/Debug/NLua.dll.mdb
NLUA_DLL_MDB
=
$(BUILD_DIR)
/NLua.dll.mdb
NLUA_DLL_MDB
=
$(BUILD_DIR)
/NLua.dll.mdb
KERALUA_DLL_SOURCE
=
../Core/KeraLua/bin/Debug/KeraLua.dll
KERALUA_DLL_SOURCE
=
../Core/KeraLua/
src/
bin/Debug/KeraLua.dll
KERALUA_DLL_MDB_SOURCE
=
../Core/KeraLua/bin/Debug/KeraLua.dll.mdb
KERALUA_DLL_MDB_SOURCE
=
../Core/KeraLua/
src/
bin/Debug/KeraLua.dll.mdb
KERALUA_DLL_MDB
=
$(BUILD_DIR)
/KeraLua.dll.mdb
KERALUA_DLL_MDB
=
$(BUILD_DIR)
/KeraLua.dll.mdb
KOPILUA_DLL_SOURCE
=
../Core/KopiLua/
b
in/Debug/KopiLua.dll
KOPILUA_DLL_SOURCE
=
../Core/KopiLua/
B
in/Debug/KopiLua.dll
KOPILUA_DLL_MDB_SOURCE
=
../Core/KopiLua/
b
in/Debug/KopiLua.dll.mdb
KOPILUA_DLL_MDB_SOURCE
=
../Core/KopiLua/
B
in/Debug/KopiLua.dll.mdb
KOPILUA_DLL_MDB
=
$(BUILD_DIR)
/KopiLua.dll.mdb
KOPILUA_DLL_MDB
=
$(BUILD_DIR)
/KopiLua.dll.mdb
endif
endif
...
@@ -42,9 +42,9 @@ CONSOLETEST_EXE_MDB=
...
@@ -42,9 +42,9 @@ CONSOLETEST_EXE_MDB=
CONSOLETEST_EXE_CONFIG_SOURCE
=
App.config
CONSOLETEST_EXE_CONFIG_SOURCE
=
App.config
NLUA_DLL_SOURCE
=
../Run/Release/NLua.dll
NLUA_DLL_SOURCE
=
../Run/Release/NLua.dll
NLUA_DLL_MDB
=
NLUA_DLL_MDB
=
KERALUA_DLL_SOURCE
=
../Core/KeraLua/bin/Release/KeraLua.dll
KERALUA_DLL_SOURCE
=
../Core/KeraLua/
src/
bin/Release/KeraLua.dll
KERALUA_DLL_MDB
=
KERALUA_DLL_MDB
=
KOPILUA_DLL_SOURCE
=
../Core/KopiLua/
b
in/Release/KopiLua.dll
KOPILUA_DLL_SOURCE
=
../Core/KopiLua/
B
in/Release/KopiLua.dll
KOPILUA_DLL_MDB
=
KOPILUA_DLL_MDB
=
endif
endif
...
...
Core/Makefile.am
View file @
d708a798
...
@@ -3,8 +3,8 @@ EXTRA_DIST =
...
@@ -3,8 +3,8 @@ EXTRA_DIST =
#Warning: This is an automatically generated file, do not edit!
#Warning: This is an automatically generated file, do not edit!
if
ENABLE_DEBUG
if
ENABLE_DEBUG
SUBDIRS
=
KopiLua KeraLua NLua
SUBDIRS
=
KopiLua
/KopiLua
KeraLua
/src
NLua
endif
endif
if
ENABLE_RELEASE
if
ENABLE_RELEASE
SUBDIRS
=
KopiLua KeraLua NLua
SUBDIRS
=
KopiLua
/KopiLua
KeraLua
/src
NLua
endif
endif
Core/NLua/Makefile.am
View file @
d708a798
...
@@ -10,17 +10,17 @@ ASSEMBLY = ../../Run/Debug/NLua.dll
...
@@ -10,17 +10,17 @@ ASSEMBLY = ../../Run/Debug/NLua.dll
ASSEMBLY_MDB
=
$(ASSEMBLY)
.mdb
ASSEMBLY_MDB
=
$(ASSEMBLY)
.mdb
COMPILE_TARGET
=
library
COMPILE_TARGET
=
library
PROJECT_REFERENCES
=
\
PROJECT_REFERENCES
=
\
../KeraLua/bin/Debug/KeraLua.dll
\
../KeraLua/
src/
bin/Debug/KeraLua.dll
\
../KopiLua/
b
in/Debug/KopiLua.dll
../KopiLua/
B
in/Debug/KopiLua.dll
BUILD_DIR
=
../../Run/Debug
BUILD_DIR
=
../../Run/Debug
NLUA_DLL_MDB_SOURCE
=
../../Run/Debug/NLua.dll.mdb
NLUA_DLL_MDB_SOURCE
=
../../Run/Debug/NLua.dll.mdb
NLUA_DLL_MDB
=
$(BUILD_DIR)
/NLua.dll.mdb
NLUA_DLL_MDB
=
$(BUILD_DIR)
/NLua.dll.mdb
KERALUA_DLL_SOURCE
=
../KeraLua/bin/Debug/KeraLua.dll
KERALUA_DLL_SOURCE
=
../KeraLua/
src/
bin/Debug/KeraLua.dll
KERALUA_DLL_MDB_SOURCE
=
../KeraLua/bin/Debug/KeraLua.dll.mdb
KERALUA_DLL_MDB_SOURCE
=
../KeraLua/
src/
bin/Debug/KeraLua.dll.mdb
KERALUA_DLL_MDB
=
$(BUILD_DIR)
/KeraLua.dll.mdb
KERALUA_DLL_MDB
=
$(BUILD_DIR)
/KeraLua.dll.mdb
KOPILUA_DLL_SOURCE
=
../KopiLua/
b
in/Debug/KopiLua.dll
KOPILUA_DLL_SOURCE
=
../KopiLua/
B
in/Debug/KopiLua.dll
KOPILUA_DLL_MDB_SOURCE
=
../KopiLua/
b
in/Debug/KopiLua.dll.mdb
KOPILUA_DLL_MDB_SOURCE
=
../KopiLua/
B
in/Debug/KopiLua.dll.mdb
KOPILUA_DLL_MDB
=
$(BUILD_DIR)
/KopiLua.dll.mdb
KOPILUA_DLL_MDB
=
$(BUILD_DIR)
/KopiLua.dll.mdb
endif
endif
...
@@ -32,14 +32,14 @@ ASSEMBLY = ../../Run/Release/NLua.dll
...
@@ -32,14 +32,14 @@ ASSEMBLY = ../../Run/Release/NLua.dll
ASSEMBLY_MDB
=
ASSEMBLY_MDB
=
COMPILE_TARGET
=
library
COMPILE_TARGET
=
library
PROJECT_REFERENCES
=
\
PROJECT_REFERENCES
=
\
../KeraLua/bin/Release/KeraLua.dll
\
../KeraLua/
src/
bin/Release/KeraLua.dll
\
../KopiLua/
b
in/Release/KopiLua.dll
../KopiLua/
B
in/Release/KopiLua.dll
BUILD_DIR
=
../../Run/Release
BUILD_DIR
=
../../Run/Release
NLUA_DLL_MDB
=
NLUA_DLL_MDB
=
KERALUA_DLL_SOURCE
=
../KeraLua/bin/Release/KeraLua.dll
KERALUA_DLL_SOURCE
=
../KeraLua/
src/
bin/Release/KeraLua.dll
KERALUA_DLL_MDB
=
KERALUA_DLL_MDB
=
KOPILUA_DLL_SOURCE
=
../KopiLua/
b
in/Release/KopiLua.dll
KOPILUA_DLL_SOURCE
=
../KopiLua/
B
in/Release/KopiLua.dll
KOPILUA_DLL_MDB
=
KOPILUA_DLL_MDB
=
endif
endif
...
...
Makefile.include
View file @
d708a798
VALID_CULTURES
=
ar
bg
ca zh-
Hans zh-CHS
cs da de el en es
fi
fr he hu is it ja ko
nl
no pl pt
rm
ro ru hr sk sq sv th
tr
ur
id
uk be sl et lv lt tg fa vi hy az eu mk tn xh zu af ka fo hi mt se ga ms kk ky sw uz bn pa gu or ta te kn ml as mr mn bo cy km lo gl kok si am tzm ne ps fil ha yo nso kl ig ii br oc gsw sah rw gd ar-SA bg-BG ca-ES zh-TW cs-CZ da-DK de-DE el-GR en-US
fi
-FI
fr-FR he-IL hu-HU is-IS it-IT ja-JP ko-KR nl-NL nb-NO pl-PL pt-BR rm-CH ro-RO ru-RU hr-HR sk-SK sq-AL sv-SE th-TH tr-TR ur-PK id-ID uk-UA be-BY sl-SI et-EE lv-LV lt-LT tg-Cyrl-TJ fa-IR vi-VN hy-AM az-Latn-AZ eu-ES mk-MK tn-ZA xh-ZA zu-ZA af-ZA ka-GE fo-FO hi-IN mt-MT se-NO ms-MY ky-KG sw-KE uz-Latn-UZ bn-IN gu-IN or-IN ta-IN te-IN kn-IN ml-IN as-IN mr-IN bo-CN cy-GB km-KH lo-LA gl-ES kok-IN si-LK am-ET ne-NP ps-AF fil-PH ha-Latn-NG yo-NG nso-ZA kl-GL ig-NG ii-CN br-FR oc-FR sah-RU rw-RW gd-GB ar-IQ zh-CN de-CH en-GB es-MX fr-BE it-CH nl-BE nn-NO pt-PT sv-FI az-Cyrl-AZ ga-IE ms-BN uz-Cyrl-UZ bn-BD mn-Mong-CN ar-EG zh-HK de-AT en-AU es-ES fr-CA se-FI ar-LY zh-SG de-LU en-CA es-GT fr-CH ar-DZ zh-MO de-LI en-NZ es-CR fr-LU ar-MA en-IE es-PA fr-MC sr-Latn-BA ar-TN en-ZA es-DO sr-Cyrl-BA ar-OM en-JM es-VE ar-YE es-CO sr-Latn-RS ar-SY en-BZ es-PE sr-Cyrl-RS ar-JO en-TT es-AR sr-Latn-ME ar-LB en-ZW es-EC sr-Cyrl-ME ar-KW en-PH es-CL ar-AE es-UY ar-BH es-PY ar-QA en-IN es-BO es-SV en-SG es-HN es-NI es-PR es-US sr-Cyrl sr-Latn az-Cyrl zh nn bs az-Latn uz-Cyrl mn-Cyrl zh-
CHT zh-Hant
nb sr tg-Cyrl uz-Latn mn-Mong tzm-Latn ha-Latn
VALID_CULTURES
=
ar
bg
ca zh-
CHS zh-Hans
cs da de el en es
fi
fr he hu is it ja ko
nl
no pl pt
rm
ro ru hr sk sq sv th
tr
ur
id
uk be sl et lv lt tg fa vi hy az eu mk tn xh zu af ka fo hi mt se ga ms kk ky sw uz bn pa gu or ta te kn ml as mr mn bo cy km lo gl kok si am tzm ne ps fil ha yo nso kl ig ii br oc gsw sah rw gd ar-SA bg-BG ca-ES zh-TW cs-CZ da-DK de-DE el-GR en-US
fi
-FI
fr-FR he-IL hu-HU is-IS it-IT ja-JP ko-KR nl-NL nb-NO pl-PL pt-BR rm-CH ro-RO ru-RU hr-HR sk-SK sq-AL sv-SE th-TH tr-TR ur-PK id-ID uk-UA be-BY sl-SI et-EE lv-LV lt-LT tg-Cyrl-TJ fa-IR vi-VN hy-AM az-Latn-AZ eu-ES mk-MK tn-ZA xh-ZA zu-ZA af-ZA ka-GE fo-FO hi-IN mt-MT se-NO ms-MY ky-KG sw-KE uz-Latn-UZ bn-IN gu-IN or-IN ta-IN te-IN kn-IN ml-IN as-IN mr-IN bo-CN cy-GB km-KH lo-LA gl-ES kok-IN si-LK am-ET ne-NP ps-AF fil-PH ha-Latn-NG yo-NG nso-ZA kl-GL ig-NG ii-CN br-FR oc-FR sah-RU rw-RW gd-GB ar-IQ zh-CN de-CH en-GB es-MX fr-BE it-CH nl-BE nn-NO pt-PT sv-FI az-Cyrl-AZ ga-IE ms-BN uz-Cyrl-UZ bn-BD mn-Mong-CN ar-EG zh-HK de-AT en-AU es-ES fr-CA se-FI ar-LY zh-SG de-LU en-CA es-GT fr-CH ar-DZ zh-MO de-LI en-NZ es-CR fr-LU ar-MA en-IE es-PA fr-MC sr-Latn-BA ar-TN en-ZA es-DO sr-Cyrl-BA ar-OM en-JM es-VE ar-YE es-CO sr-Latn-RS ar-SY en-BZ es-PE sr-Cyrl-RS ar-JO en-TT es-AR sr-Latn-ME ar-LB en-ZW es-EC sr-Cyrl-ME ar-KW en-PH es-CL ar-AE es-UY ar-BH es-PY ar-QA en-IN es-BO es-SV en-SG es-HN es-NI es-PR es-US sr-Cyrl sr-Latn az-Cyrl zh nn bs az-Latn uz-Cyrl mn-Cyrl zh-
Hant zh-CHT
nb sr tg-Cyrl uz-Latn mn-Mong tzm-Latn ha-Latn
s2q
=
$(
subst
\
,?,
$1
)
s2q
=
$(
subst
\
,?,
$1
)
q2s
=
$(
subst
?,
\
,
$1
)
q2s
=
$(
subst
?,
\
,
$1
)
...
...
NLuaTest/Makefile.am
View file @
d708a798
...
@@ -10,19 +10,19 @@ ASSEMBLY = ../tests/NLuaTest.dll
...
@@ -10,19 +10,19 @@ ASSEMBLY = ../tests/NLuaTest.dll
ASSEMBLY_MDB
=
$(ASSEMBLY)
.mdb
ASSEMBLY_MDB
=
$(ASSEMBLY)
.mdb
COMPILE_TARGET
=
library
COMPILE_TARGET
=
library
PROJECT_REFERENCES
=
\
PROJECT_REFERENCES
=
\
../Core/KeraLua/bin/Debug/KeraLua.dll
\
../Core/KeraLua/
src/
bin/Debug/KeraLua.dll
\
../Core/KopiLua/
b
in/Debug/KopiLua.dll
\
../Core/KopiLua/
B
in/Debug/KopiLua.dll
\
../Run/Debug/NLua.dll
../Run/Debug/NLua.dll
BUILD_DIR
=
../tests/
BUILD_DIR
=
../tests/
NLUATEST_DLL_MDB_SOURCE
=
../tests/NLuaTest.dll.mdb
NLUATEST_DLL_MDB_SOURCE
=
../tests/NLuaTest.dll.mdb
NLUATEST_DLL_MDB
=
$(BUILD_DIR)
/NLuaTest.dll.mdb
NLUATEST_DLL_MDB
=
$(BUILD_DIR)
/NLuaTest.dll.mdb
NUNIT_FRAMEWORK_DLL_SOURCE
=
../lib/nunit/nunit.framework.dll
NUNIT_FRAMEWORK_DLL_SOURCE
=
../lib/nunit/nunit.framework.dll
KERALUA_DLL_SOURCE
=
../Core/KeraLua/bin/Debug/KeraLua.dll
KERALUA_DLL_SOURCE
=
../Core/KeraLua/
src/
bin/Debug/KeraLua.dll
KERALUA_DLL_MDB_SOURCE
=
../Core/KeraLua/bin/Debug/KeraLua.dll.mdb
KERALUA_DLL_MDB_SOURCE
=
../Core/KeraLua/
src/
bin/Debug/KeraLua.dll.mdb
KERALUA_DLL_MDB
=
$(BUILD_DIR)
/KeraLua.dll.mdb
KERALUA_DLL_MDB
=
$(BUILD_DIR)
/KeraLua.dll.mdb
KOPILUA_DLL_SOURCE
=
../Core/KopiLua/
b
in/Debug/KopiLua.dll
KOPILUA_DLL_SOURCE
=
../Core/KopiLua/
B
in/Debug/KopiLua.dll
KOPILUA_DLL_MDB_SOURCE
=
../Core/KopiLua/
b
in/Debug/KopiLua.dll.mdb
KOPILUA_DLL_MDB_SOURCE
=
../Core/KopiLua/
B
in/Debug/KopiLua.dll.mdb
KOPILUA_DLL_MDB
=
$(BUILD_DIR)
/KopiLua.dll.mdb
KOPILUA_DLL_MDB
=
$(BUILD_DIR)
/KopiLua.dll.mdb
NLUA_DLL_SOURCE
=
../Run/Debug/NLua.dll
NLUA_DLL_SOURCE
=
../Run/Debug/NLua.dll
NLUA_DLL_MDB_SOURCE
=
../Run/Debug/NLua.dll.mdb
NLUA_DLL_MDB_SOURCE
=
../Run/Debug/NLua.dll.mdb
...
@@ -37,16 +37,16 @@ ASSEMBLY = ../tests/NLuaTest.dll
...
@@ -37,16 +37,16 @@ ASSEMBLY = ../tests/NLuaTest.dll
ASSEMBLY_MDB
=
ASSEMBLY_MDB
=
COMPILE_TARGET
=
library
COMPILE_TARGET
=
library
PROJECT_REFERENCES
=
\
PROJECT_REFERENCES
=
\
../Core/KeraLua/bin/Release/KeraLua.dll
\
../Core/KeraLua/
src/
bin/Release/KeraLua.dll
\
../Core/KopiLua/
b
in/Release/KopiLua.dll
\
../Core/KopiLua/
B
in/Release/KopiLua.dll
\
../Run/Release/NLua.dll
../Run/Release/NLua.dll
BUILD_DIR
=
../tests/
BUILD_DIR
=
../tests/
NLUATEST_DLL_MDB
=
NLUATEST_DLL_MDB
=
NUNIT_FRAMEWORK_DLL_SOURCE
=
../lib/nunit/nunit.framework.dll
NUNIT_FRAMEWORK_DLL_SOURCE
=
../lib/nunit/nunit.framework.dll
KERALUA_DLL_SOURCE
=
../Core/KeraLua/bin/Release/KeraLua.dll
KERALUA_DLL_SOURCE
=
../Core/KeraLua/
src/
bin/Release/KeraLua.dll
KERALUA_DLL_MDB
=
KERALUA_DLL_MDB
=
KOPILUA_DLL_SOURCE
=
../Core/KopiLua/
b
in/Release/KopiLua.dll
KOPILUA_DLL_SOURCE
=
../Core/KopiLua/
B
in/Release/KopiLua.dll
KOPILUA_DLL_MDB
=
KOPILUA_DLL_MDB
=
NLUA_DLL_SOURCE
=
../Run/Release/NLua.dll
NLUA_DLL_SOURCE
=
../Run/Release/NLua.dll
NLUA_DLL_MDB
=
NLUA_DLL_MDB
=
...
...
configure.ac
View file @
d708a798
...
@@ -55,10 +55,10 @@ dnl package checks, per config
...
@@ -55,10 +55,10 @@ dnl package checks, per config
AC_CONFIG_FILES([
AC_CONFIG_FILES([
Core/KopiLua/kopilua.pc
Core/KopiLua/
KopiLua/
kopilua.pc
Core/KopiLua/Makefile
Core/KopiLua/
KopiLua/
Makefile
Core/KeraLua/keralua.pc
Core/KeraLua/
src/
keralua.pc
Core/KeraLua/Makefile
Core/KeraLua/
src/
Makefile
Core/NLua/nlua.pc
Core/NLua/nlua.pc
Core/NLua/Makefile
Core/NLua/Makefile
Core/Makefile
Core/Makefile
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment