Commit 0ea97449 authored by Megax's avatar Megax
Browse files

* Makefile update.

parent 5cceea06
......@@ -2,8 +2,8 @@
# Warning: This is an automatically generated file, do not edit!
if ENABLE_DEBUG_X86
ASSEMBLY_COMPILER_COMMAND = dmcs
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
ASSEMBLY = ../../Run/Debug/LuaRunner.exe
ASSEMBLY_MDB = $(ASSEMBLY).mdb
......@@ -14,13 +14,21 @@ BUILD_DIR = ../../Run/Debug
LUARUNNER_EXE_MDB_SOURCE=../../Run/Debug/LuaRunner.exe.mdb
LUARUNNER_EXE_MDB=$(BUILD_DIR)/LuaRunner.exe.mdb
LUAINTERFACE_DLL_SOURCE=../../Run/Debug/NLua.dll
KOPILUA_DLL_SOURCE=../../Run/Debug/KopiLua.dll
LUARUNNER_EXE_CONFIG_SOURCE=app.config
NLUA_DLL_SOURCE=../../Run/Debug/NLua.dll
NLUA_DLL_MDB_SOURCE=../../Run/Debug/NLua.dll.mdb
NLUA_DLL_MDB=$(BUILD_DIR)/NLua.dll.mdb
KERALUA_DLL_SOURCE=../../Core/KeraLua/bin/Debug/KeraLua.dll
KERALUA_DLL_MDB_SOURCE=../../Core/KeraLua/bin/Debug/KeraLua.dll.mdb
KERALUA_DLL_MDB=$(BUILD_DIR)/KeraLua.dll.mdb
KOPILUA_DLL_SOURCE=../../Core/KopiLua/bin/Debug/KopiLua.dll
KOPILUA_DLL_MDB_SOURCE=../../Core/KopiLua/bin/Debug/KopiLua.dll.mdb
KOPILUA_DLL_MDB=$(BUILD_DIR)/KopiLua.dll.mdb
endif
if ENABLE_RELEASE_X86
ASSEMBLY_COMPILER_COMMAND = dmcs
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:RELEASE"
ASSEMBLY = ../../Run/Release/LuaRunner.exe
ASSEMBLY_MDB =
......@@ -30,51 +38,28 @@ PROJECT_REFERENCES = \
BUILD_DIR = ../../Run/Release
LUARUNNER_EXE_MDB=
LUAINTERFACE_DLL_SOURCE=../../Run/Release/NLua.dll
KOPILUA_DLL_SOURCE=../../Run/Release/KopiLua.dll
LUARUNNER_EXE_CONFIG_SOURCE=app.config
NLUA_DLL_SOURCE=../../Run/Release/NLua.dll
NLUA_DLL_MDB=
KERALUA_DLL_SOURCE=../../Core/KeraLua/bin/Release/KeraLua.dll
KERALUA_DLL_MDB=
KOPILUA_DLL_SOURCE=../../Core/KopiLua/bin/Release/KopiLua.dll
KOPILUA_DLL_MDB=
endif
if ENABLE_DEBUG_X64
ASSEMBLY_COMPILER_COMMAND = dmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
ASSEMBLY = ../../Run/Debug_x64/LuaRunner.exe
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = exe
PROJECT_REFERENCES = \
../../Run/Debug_x64/NLua.dll
BUILD_DIR = ../../Run/Debug_x64
LUARUNNER_EXE_MDB_SOURCE=../../Run/Debug_x64/LuaRunner.exe.mdb
LUARUNNER_EXE_MDB=$(BUILD_DIR)/LuaRunner.exe.mdb
LUAINTERFACE_DLL_SOURCE=../../Run/Debug_x64/NLua.dll
KOPILUA_DLL_SOURCE=../../Run/Debug_x64/KopiLua.dll
endif
if ENABLE_RELEASE_X64
ASSEMBLY_COMPILER_COMMAND = dmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:RELEASE"
ASSEMBLY = ../../Run/Release_x64/LuaRunner.exe
ASSEMBLY_MDB =
COMPILE_TARGET = exe
PROJECT_REFERENCES = \
../../Run/Release_x64/NLua.dll
BUILD_DIR = ../../Run/Release_x64
LUARUNNER_EXE_MDB=
LUAINTERFACE_DLL_SOURCE=../../Run/Release_x64/NLua.dll
KOPILUA_DLL_SOURCE=../../Run/Release_x64/KopiLua.dll
endif
AL=al
AL=al2
SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
PROGRAMFILES = \
$(LUARUNNER_EXE_MDB) \
$(LUAINTERFACE_DLL) \
$(KOPILUA_DLL)
$(LUARUNNER_EXE_CONFIG) \
$(NLUA_DLL) \
$(NLUA_DLL_MDB) \
$(KERALUA_DLL) \
$(KERALUA_DLL_MDB) \
$(KOPILUA_DLL) \
$(KOPILUA_DLL_MDB)
BINARIES = \
$(LUARUNNER)
......@@ -93,6 +78,7 @@ DATA_FILES =
RESOURCES =
EXTRAS = \
app.config \
luarunner.in
REFERENCES = \
......@@ -106,10 +92,17 @@ CLEANFILES = $(PROGRAMFILES) $(BINARIES)
include $(top_srcdir)/Makefile.include
LUAINTERFACE_DLL = $(BUILD_DIR)/NLua.dll
LUARUNNER_EXE_CONFIG = $(BUILD_DIR)/LuaRunner.exe.config
NLUA_DLL = $(BUILD_DIR)/NLua.dll
KERALUA_DLL = $(BUILD_DIR)/KeraLua.dll
KOPILUA_DLL = $(BUILD_DIR)/KopiLua.dll
LUARUNNER = $(BUILD_DIR)/luarunner
$(eval $(call emit-deploy-target,LUARUNNER_EXE_CONFIG))
$(eval $(call emit-deploy-target,KERALUA_DLL))
$(eval $(call emit-deploy-target,KERALUA_DLL_MDB))
$(eval $(call emit-deploy-target,KOPILUA_DLL))
$(eval $(call emit-deploy-target,KOPILUA_DLL_MDB))
$(eval $(call emit-deploy-wrapper,LUARUNNER,luarunner,x))
......
......@@ -2,16 +2,10 @@
EXTRA_DIST =
#Warning: This is an automatically generated file, do not edit!
if ENABLE_DEBUG_X86
if ENABLE_DEBUG
SUBDIRS = .
endif
if ENABLE_RELEASE_X86
SUBDIRS = .
endif
if ENABLE_DEBUG_X64
SUBDIRS = .
endif
if ENABLE_RELEASE_X64
if ENABLE_RELEASE
SUBDIRS = .
endif
......
......@@ -2,15 +2,9 @@
EXTRA_DIST =
#Warning: This is an automatically generated file, do not edit!
if ENABLE_DEBUG_X86
SUBDIRS = KopiLua NLua
if ENABLE_DEBUG
SUBDIRS = KopiLua KeraLua NLua
endif
if ENABLE_RELEASE_X86
SUBDIRS = KopiLua NLua
endif
if ENABLE_DEBUG_X64
SUBDIRS = KopiLua NLua
endif
if ENABLE_RELEASE_X64
SUBDIRS = KopiLua NLua
if ENABLE_RELEASE
SUBDIRS = KopiLua KeraLua NLua
endif
......@@ -3,77 +3,59 @@ EXTRA_DIST =
# Warning: This is an automatically generated file, do not edit!
if ENABLE_DEBUG_X86
ASSEMBLY_COMPILER_COMMAND = dmcs
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
ASSEMBLY = ../../Run/Debug/NLua.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = library
PROJECT_REFERENCES = \
../../Run/Debug/KopiLua.dll
../KeraLua/bin/Debug/KeraLua.dll \
../KopiLua/bin/Debug/KopiLua.dll
BUILD_DIR = ../../Run/Debug
LUAINTERFACE_DLL_MDB_SOURCE=../../Run/Debug/NLua.dll.mdb
LUAINTERFACE_DLL_MDB=$(BUILD_DIR)/NLua.dll.mdb
KOPILUA_DLL_SOURCE=../../Run/Debug/KopiLua.dll
NLUA_DLL_MDB_SOURCE=../../Run/Debug/NLua.dll.mdb
NLUA_DLL_MDB=$(BUILD_DIR)/NLua.dll.mdb
KERALUA_DLL_SOURCE=../KeraLua/bin/Debug/KeraLua.dll
KERALUA_DLL_MDB_SOURCE=../KeraLua/bin/Debug/KeraLua.dll.mdb
KERALUA_DLL_MDB=$(BUILD_DIR)/KeraLua.dll.mdb
KOPILUA_DLL_SOURCE=../KopiLua/bin/Debug/KopiLua.dll
KOPILUA_DLL_MDB_SOURCE=../KopiLua/bin/Debug/KopiLua.dll.mdb
KOPILUA_DLL_MDB=$(BUILD_DIR)/KopiLua.dll.mdb
endif
if ENABLE_RELEASE_X86
ASSEMBLY_COMPILER_COMMAND = dmcs
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:RELEASE"
ASSEMBLY = ../../Run/Release/NLua.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
PROJECT_REFERENCES = \
../../Run/Release/KopiLua.dll
../KeraLua/bin/Release/KeraLua.dll \
../KopiLua/bin/Release/KopiLua.dll
BUILD_DIR = ../../Run/Release
LUAINTERFACE_DLL_MDB=
KOPILUA_DLL_SOURCE=../../Run/Release/KopiLua.dll
NLUA_DLL_MDB=
KERALUA_DLL_SOURCE=../KeraLua/bin/Release/KeraLua.dll
KERALUA_DLL_MDB=
KOPILUA_DLL_SOURCE=../KopiLua/bin/Release/KopiLua.dll
KOPILUA_DLL_MDB=
endif
if ENABLE_DEBUG_X64
ASSEMBLY_COMPILER_COMMAND = dmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
ASSEMBLY = ../../Run/Debug_x64/NLua.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = library
PROJECT_REFERENCES = \
../../Run/Debug_x64/KopiLua.dll
BUILD_DIR = ../../Run/Debug_x64
LUAINTERFACE_DLL_MDB_SOURCE=../../Run/Debug_x64/NLua.dll.mdb
LUAINTERFACE_DLL_MDB=$(BUILD_DIR)/NLua.dll.mdb
KOPILUA_DLL_SOURCE=../../Run/Debug_x64/KopiLua.dll
endif
if ENABLE_RELEASE_X64
ASSEMBLY_COMPILER_COMMAND = dmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:RELEASE"
ASSEMBLY = ../../Run/Release_x64/NLua.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
PROJECT_REFERENCES = \
../../Run/Release_x64/KopiLua.dll
BUILD_DIR = ../../Run/Release_x64
LUAINTERFACE_DLL_MDB=
KOPILUA_DLL_SOURCE=../../Run/Release_x64/KopiLua.dll
endif
AL=al
AL=al2
SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
PROGRAMFILES = \
$(LUAINTERFACE_DLL_MDB) \
$(KOPILUA_DLL)
$(NLUA_DLL_MDB) \
$(KERALUA_DLL) \
$(KERALUA_DLL_MDB) \
$(KOPILUA_DLL) \
$(KOPILUA_DLL_MDB)
LINUX_PKGCONFIG = \
$(LUAINTERFACE_PC)
$(NLUA_PC)
RESGEN=resgen2
......@@ -120,25 +102,21 @@ FILES = \
LuaLib/LuaIndexes.cs \
LuaLib/GCOptions.cs \
LuaLib/LuaLib.cs \
Config/NLuaConfig.cs
Config/NLuaConfig.cs \
ObjectTranslatorPool.cs
DATA_FILES =
RESOURCES =
EXTRAS = \
Extensions \
GenerateEventAssembly \
Event \
Exceptions \
Method \
Config \
nlua.pc.in
REFERENCES = \
System \
System.Data \
System.Xml
System.Xml \
System.Core
DLL_REFERENCES =
......@@ -146,10 +124,15 @@ CLEANFILES = $(PROGRAMFILES) $(LINUX_PKGCONFIG)
include $(top_srcdir)/Makefile.include
KERALUA_DLL = $(BUILD_DIR)/KeraLua.dll
KOPILUA_DLL = $(BUILD_DIR)/KopiLua.dll
LUAINTERFACE_PC = $(BUILD_DIR)/nlua.pc
NLUA_PC = $(BUILD_DIR)/nlua.pc
$(eval $(call emit-deploy-wrapper,LUAINTERFACE_PC,nlua.pc))
$(eval $(call emit-deploy-target,KERALUA_DLL))
$(eval $(call emit-deploy-target,KERALUA_DLL_MDB))
$(eval $(call emit-deploy-target,KOPILUA_DLL))
$(eval $(call emit-deploy-target,KOPILUA_DLL_MDB))
$(eval $(call emit-deploy-wrapper,NLUA_PC,nlua.pc))
$(eval $(call emit_resgen_targets))
......
EXTRA_DIST = expansions.m4
EXTRA_DIST = expansions.m4 lib/nunit/nunit.framework.dll
#Warning: This is an automatically generated file, do not edit!
if ENABLE_DEBUG_X86
SUBDIRS = Core Test/TestNLua Applications/LuaRunner
if ENABLE_DEBUG
SUBDIRS = Core NLuaTest ConsoleTest Applications/LuaRunner
endif
if ENABLE_RELEASE_X86
SUBDIRS = Core Test/TestNLua Applications/LuaRunner
endif
if ENABLE_DEBUG_X64
SUBDIRS = Core Test/TestNLua Applications/LuaRunner
endif
if ENABLE_RELEASE_X64
SUBDIRS = Core Test/TestNLua Applications/LuaRunner
if ENABLE_RELEASE
SUBDIRS = Core NLuaTest ConsoleTest Applications/LuaRunner
endif
VALID_CULTURES = ar bg ca zh-CHS cs da de el en es fi fr he hu is it ja ko nl no pl pt ro ru hr sk sq sv th tr id uk be sl et lv lt fa vi hy eu mk af ka fo hi sw gu ta te kn mr gl kok 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 ro-RO ru-RU hr-HR sk-SK sq-AL sv-SE th-TH tr-TR id-ID uk-UA be-BY sl-SI et-EE lv-LV lt-LT fa-IR vi-VN hy-AM eu-ES mk-MK af-ZA ka-GE fo-FO hi-IN sw-KE gu-IN ta-IN te-IN kn-IN mr-IN gl-ES kok-IN ar-IQ zh-CN de-CH en-GB es-MX fr-BE it-CH nl-BE nn-NO pt-PT sv-FI ar-EG zh-HK de-AT en-AU es-ES fr-CA ar-LY zh-SG de-LU en-CA es-GT fr-CH ar-DZ zh-MO en-NZ es-CR fr-LU ar-MA en-IE es-PA ar-TN en-ZA es-DO ar-OM es-VE ar-YE es-CO ar-SY es-PE ar-JO en-TT es-AR ar-LB en-ZW es-EC ar-KW en-PH es-CL ar-AE es-UY ar-BH es-PY ar-QA es-BO es-SV es-HN es-NI es-PR zh-CHT
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
s2q=$(subst \ ,?,$1)
q2s=$(subst ?,\ ,$1)
......
File mode changed from 100644 to 100755
......@@ -17,47 +17,35 @@ SHAMROCK_EXPAND_DATADIR
AC_PROG_INSTALL
AC_PATH_PROG(GMCS, gmcs, no)
if test "x$GMCS" = "xno"; then
AC_MSG_ERROR([gmcs Not found])
fi
AC_PATH_PROG(DMCS, dmcs, no)
if test "x$DMCS" = "xno"; then
AC_MSG_ERROR([dmcs Not found])
fi
AC_ARG_ENABLE(debug_x86,
AC_HELP_STRING([--enable-debug_x86],
[Use 'DEBUG_X86' Configuration [default=NO]]),
enable_debug_x86=yes, enable_debug_x86=no)
AM_CONDITIONAL(ENABLE_DEBUG_X86, test x$enable_debug_x86 = xyes)
if test "x$enable_debug_x86" = "xyes" ; then
CONFIG_REQUESTED="yes"
fi
AC_ARG_ENABLE(release_x86,
AC_HELP_STRING([--enable-release_x86],
[Use 'RELEASE_X86' Configuration [default=YES]]),
enable_release_x86=yes, enable_release_x86=no)
AM_CONDITIONAL(ENABLE_RELEASE_X86, test x$enable_release_x86 = xyes)
if test "x$enable_release_x86" = "xyes" ; then
CONFIG_REQUESTED="yes"
fi
AC_ARG_ENABLE(debug_x64,
AC_HELP_STRING([--enable-debug_x64],
[Use 'DEBUG_X64' Configuration [default=NO]]),
enable_debug_x64=yes, enable_debug_x64=no)
AM_CONDITIONAL(ENABLE_DEBUG_X64, test x$enable_debug_x64 = xyes)
if test "x$enable_debug_x64" = "xyes" ; then
AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug],
[Use 'DEBUG' Configuration [default=NO]]),
enable_debug=yes, enable_debug=no)
AM_CONDITIONAL(ENABLE_DEBUG, test x$enable_debug = xyes)
if test "x$enable_debug" = "xyes" ; then
CONFIG_REQUESTED="yes"
fi
AC_ARG_ENABLE(release_x64,
AC_HELP_STRING([--enable-release_x64],
[Use 'RELEASE_X64' Configuration [default=NO]]),
enable_release_x64=yes, enable_release_x64=no)
AM_CONDITIONAL(ENABLE_RELEASE_X64, test x$enable_release_x64 = xyes)
if test "x$enable_release_x64" = "xyes" ; then
AC_ARG_ENABLE(release,
AC_HELP_STRING([--enable-release],
[Use 'RELEASE' Configuration [default=YES]]),
enable_release=yes, enable_release=no)
AM_CONDITIONAL(ENABLE_RELEASE, test x$enable_release = xyes)
if test "x$enable_release" = "xyes" ; then
CONFIG_REQUESTED="yes"
fi
if test -z "$CONFIG_REQUESTED" ; then
AM_CONDITIONAL(ENABLE_RELEASE_X86, true)
enable_release_x86=yes
AM_CONDITIONAL(ENABLE_RELEASE, true)
enable_release=yes
fi
......@@ -69,11 +57,15 @@ dnl package checks, per config
AC_CONFIG_FILES([
Core/KopiLua/kopilua.pc
Core/KopiLua/Makefile
Core/KeraLua/keralua.pc
Core/KeraLua/Makefile
Core/NLua/nlua.pc
Core/NLua/Makefile
Core/Makefile
Test/TestNLua/testnlua
Test/TestNLua/Makefile
NLuaTest/nluatest.pc
NLuaTest/Makefile
ConsoleTest/consoletest
ConsoleTest/Makefile
Applications/LuaRunner/luarunner
Applications/LuaRunner/Makefile
Makefile
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment