Previous 199869 Revisions Next

r45218 Thursday 25th February, 2016 at 13:58:39 UTC by Miodrag Milanović
split PARAMS into PARAMS and TARGET_PARAMS (nw)
[/trunk]makefile

trunk/makefile
r253729r253730
521521endif
522522
523523ifdef NOASM
524PARAMS += --NOASM='$(NOASM)'
524TARGET_PARAMS += --NOASM='$(NOASM)'
525525endif
526526
527527ifdef BIGENDIAN
r253729r253730
545545endif
546546
547547ifdef OSD
548PARAMS += --osd='$(OSD)'
548TARGET_PARAMS += --osd='$(OSD)'
549549endif
550550
551551ifdef BUILDDIR
r253729r253730
553553endif
554554
555555ifdef TARGETOS
556PARAMS += --targetos='$(TARGETOS)'
556TARGET_PARAMS += --targetos='$(TARGETOS)'
557557endif
558558
559559ifdef DONT_USE_NETWORK
r253729r253730
681681endif
682682
683683ifdef PLATFORM
684PARAMS += --PLATFORM='$(PLATFORM)'
684TARGET_PARAMS += --PLATFORM='$(PLATFORM)'
685685endif
686686
687687#-------------------------------------------------
r253729r253730
837837ifndef MINGW64
838838   $(error MINGW64 is not set)
839839endif
840   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw64-gcc --gcc_version=$(GCC_VERSION) gmake
840   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=mingw64-gcc --gcc_version=$(GCC_VERSION) gmake
841841
842842.PHONY: windows_x64
843843windows_x64: generate $(PROJECTDIR)/gmake-mingw64-gcc/Makefile
r253729r253730
858858ifndef MINGW32
859859   $(error MINGW32 is not set)
860860endif
861   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw32-gcc --gcc_version=$(GCC_VERSION) gmake
861   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=mingw32-gcc --gcc_version=$(GCC_VERSION) gmake
862862
863863.PHONY: windows_x86
864864windows_x86: generate $(PROJECTDIR)/gmake-mingw32-gcc/Makefile
r253729r253730
873873#-------------------------------------------------
874874
875875$(PROJECTDIR)/gmake-mingw-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
876   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw-clang --gcc_version=$(CLANG_VERSION) gmake
876   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=mingw-clang --gcc_version=$(CLANG_VERSION) gmake
877877
878878.PHONY: windows_x64_clang
879879windows_x64_clang: generate $(PROJECTDIR)/gmake-mingw-clang/Makefile
r253729r253730
886886   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES)
887887
888888vs2013: generate
889   $(SILENT) $(GENIE) $(PARAMS) vs2013
889   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2013
890890ifdef MSBUILD
891891   $(SILENT) msbuild $(PROJECTDIR)/vs2013/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
892892endif
893893
894894vs2013_intel: generate
895   $(SILENT) $(GENIE) $(PARAMS) --vs=intel-15 vs2013
895   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2013
896896ifdef MSBUILD
897897   $(SILENT) msbuild $(PROJECTDIR)/vs2013-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
898898endif
899899
900900vs2013_xp: generate
901   $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-xp vs2013
901   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=vs2013-xp vs2013
902902ifdef MSBUILD
903903   $(SILENT) msbuild $(PROJECTDIR)/vs2013-xp/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
904904endif
905905
906906vs2013_clang: generate
907   $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-clang vs2013
907   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=vs2013-clang vs2013
908908
909909vs2013_winrt: generate
910   $(SILENT) $(GENIE) $(PARAMS) --vs=winstore81 vs2013
910   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore81 vs2013
911911
912912vs2015: generate
913   $(SILENT) $(GENIE) $(PARAMS) vs2015
913   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2015
914914ifdef MSBUILD
915915   $(SILENT) msbuild $(PROJECTDIR)/vs2015/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
916916endif
917917
918918vs2015_intel: generate
919   $(SILENT) $(GENIE) $(PARAMS) --vs=intel-15 vs2015
919   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2015
920920ifdef MSBUILD
921921   $(SILENT) msbuild $(PROJECTDIR)/vs2015-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
922922endif
923923
924924vs2015_xp: generate
925   $(SILENT) $(GENIE) $(PARAMS) --vs=vs2015-xp vs2015
925   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=vs2015-xp vs2015
926926ifdef MSBUILD
927927   $(SILENT) msbuild $(PROJECTDIR)/vs2015-xp/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
928928endif
929929
930930vs2015_clang: generate
931   $(SILENT) $(GENIE) $(PARAMS) --vs=vs2015-clang vs2015
931   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=vs2015-clang vs2015
932932
933933vs2015_winrt: generate
934   $(SILENT) $(GENIE) $(PARAMS) --vs=winstore81 vs2015
934   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore81 vs2015
935935
936936android-arm: generate
937937ifndef ANDROID_NDK_ARM
r253729r253730
941941   $(error ANDROID_NDK_ROOT is not set)
942942endif
943943ifndef COMPILE
944   $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=4.8 gmake
944   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=android-arm --gcc_version=4.8 gmake
945945endif
946946   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-android-arm config=$(CONFIG)
947947
r253729r253730
953953   $(error ANDROID_NDK_ROOT is not set)
954954endif
955955ifndef COMPILE
956   $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=4.8 gmake
956   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=android-mips --gcc_version=4.8 gmake
957957endif
958958   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-android-mips config=$(CONFIG)
959959
r253729r253730
965965   $(error ANDROID_NDK_ROOT is not set)
966966endif
967967ifndef COMPILE
968   $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=4.8 gmake
968   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=android-x86 --gcc_version=4.8 gmake
969969endif
970970   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-android-x86 config=$(CONFIG)
971971
r253729r253730
974974   $(error EMSCRIPTEN is not set)
975975endif
976976ifndef COMPILE
977   $(SILENT) $(GENIE) $(PARAMS) --gcc=asmjs --gcc_version=4.9 gmake
977   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=asmjs --gcc_version=4.9 gmake
978978endif
979979   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-asmjs config=$(CONFIG)
980980
r253729r253730
986986   $(error NACL_SDK_ROOT is not set)
987987endif
988988ifndef COMPILE
989   $(SILENT) $(GENIE) $(PARAMS) --gcc=nacl --gcc_version=4.8 gmake
989   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=nacl --gcc_version=4.8 gmake
990990endif
991991   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-nacl config=$(CONFIG)64
992992
r253729r253730
995995   $(error NACL_SDK_ROOT is not set)
996996endif
997997ifndef COMPILE
998   $(SILENT) $(GENIE) $(PARAMS) --gcc=nacl --gcc_version=4.8 gmake
998   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=nacl --gcc_version=4.8 gmake
999999endif
10001000   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-nacl config=$(CONFIG)32
10011001
r253729r253730
10041004   $(error NACL_SDK_ROOT is not set)
10051005endif
10061006ifndef COMPILE
1007   $(SILENT) $(GENIE) $(PARAMS) --gcc=nacl-arm --gcc_version=4.8 gmake
1007   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=nacl-arm --gcc_version=4.8 gmake
10081008endif
10091009   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-nacl-arm config=$(CONFIG)
10101010
r253729r253730
10131013   $(error NACL_SDK_ROOT is not set)
10141014endif
10151015ifndef COMPILE
1016   $(SILENT) $(GENIE) $(PARAMS) --gcc=pnacl --gcc_version=4.8 gmake
1016   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=pnacl --gcc_version=4.8 gmake
10171017endif
10181018   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-pnacl config=$(CONFIG)
10191019
r253729r253730
10221022#-------------------------------------------------
10231023
10241024$(PROJECTDIR)/gmake-linux/Makefile: makefile $(SCRIPTS) $(GENIE)
1025   $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-gcc --gcc_version=$(GCC_VERSION) gmake
1025   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=linux-gcc --gcc_version=$(GCC_VERSION) gmake
10261026
10271027.PHONY: linux_x64
10281028linux_x64: generate $(PROJECTDIR)/gmake-linux/Makefile
r253729r253730
10441044#-------------------------------------------------
10451045
10461046$(PROJECTDIR)/gmake-linux-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
1047   $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-clang --gcc_version=$(CLANG_VERSION) gmake
1047   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=linux-clang --gcc_version=$(CLANG_VERSION) gmake
10481048
10491049.PHONY: linux_x64_clang
10501050linux_x64_clang: generate $(PROJECTDIR)/gmake-linux-clang/Makefile
r253729r253730
10611061#-------------------------------------------------
10621062
10631063$(PROJECTDIR)/gmake-osx/Makefile: makefile $(SCRIPTS) $(GENIE)
1064   $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --gcc_version=$(GCC_VERSION) gmake
1064   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=osx --gcc_version=$(GCC_VERSION) gmake
10651065
10661066.PHONY: macosx_x64
10671067macosx_x64: generate $(PROJECTDIR)/gmake-osx/Makefile
r253729r253730
10811081#-------------------------------------------------
10821082
10831083$(PROJECTDIR)/gmake-osx-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
1084   $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --gcc_version=$(CLANG_VERSION) gmake
1084   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=osx-clang --gcc_version=$(CLANG_VERSION) gmake
10851085
10861086.PHONY: macosx_x64_clang
10871087macosx_x64_clang: generate $(PROJECTDIR)/gmake-osx-clang/Makefile
r253729r253730
10941094   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-osx-clang config=$(CONFIG)32
10951095
10961096xcode4: generate
1097   $(SILENT) $(GENIE) $(PARAMS) --targetos=macosx --xcode=osx xcode4
1097   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --targetos=macosx --xcode=osx xcode4
10981098
10991099xcode4-ios: generate
1100   $(SILENT) $(GENIE) $(PARAMS) --targetos=macosx --xcode=ios xcode4
1100   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --targetos=macosx --xcode=ios xcode4
11011101
11021102#-------------------------------------------------
11031103# gmake-solaris
r253729r253730
11051105
11061106
11071107$(PROJECTDIR)/gmake-solaris/Makefile: makefile $(SCRIPTS) $(GENIE)
1108   $(SILENT) $(GENIE) $(PARAMS) --gcc=solaris --gcc_version=$(GCC_VERSION) gmake
1108   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=solaris --gcc_version=$(GCC_VERSION) gmake
11091109
11101110.PHONY: solaris_x64
11111111solaris_x64: generate $(PROJECTDIR)/gmake-solaris/Makefile
r253729r253730
11271127
11281128
11291129$(PROJECTDIR)/gmake-freebsd/Makefile: makefile $(SCRIPTS) $(GENIE)
1130   $(SILENT) $(GENIE) $(PARAMS) --gcc=freebsd --gcc_version=$(GCC_VERSION) gmake
1130   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=freebsd --gcc_version=$(GCC_VERSION) gmake
11311131
11321132.PHONY: freebsd_x64
11331133freebsd_x64: generate $(PROJECTDIR)/gmake-freebsd/Makefile
r253729r253730
11491149
11501150
11511151$(PROJECTDIR)/gmake-netbsd/Makefile: makefile $(SCRIPTS) $(GENIE)
1152   $(SILENT) $(GENIE) $(PARAMS) --gcc=netbsd --gcc_version=$(GCC_VERSION) gmake
1152   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=netbsd --gcc_version=$(GCC_VERSION) gmake
11531153
11541154.PHONY: netbsd_x64
11551155netbsd_x64: generate $(PROJECTDIR)/gmake-netbsd/Makefile
r253729r253730
11711171
11721172
11731173$(PROJECTDIR)/gmake-os2/Makefile: makefile $(SCRIPTS) $(GENIE)
1174   $(SILENT) $(GENIE) $(PARAMS) --gcc=os2 --gcc_version=$(GCC_VERSION) gmake
1174   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=os2 --gcc_version=$(GCC_VERSION) gmake
11751175
11761176.PHONY: os2
11771177os2: os2_x86
r253729r253730
11931193ifndef MARVELL_ROOTFS
11941194   $(error MARVELL_ROOTFS is not set)
11951195endif
1196   $(SILENT) $(GENIE) $(PARAMS) --gcc=steamlink --gcc_version=$(GCC_VERSION) --NO_OPENGL=1 --NO_USE_MIDI=1 --NO_X11=1 --NOASM=1 --SDL_INSTALL_ROOT=$(MARVELL_ROOTFS)/usr  gmake 
1196   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=steamlink --gcc_version=$(GCC_VERSION) --NO_OPENGL=1 --NO_USE_MIDI=1 --NO_X11=1 --NOASM=1 --SDL_INSTALL_ROOT=$(MARVELL_ROOTFS)/usr  gmake 
11971197
11981198.PHONY: steamlink
11991199ifndef MARVELL_SDK_PATH
r253729r253730
12121212# cmake
12131213#-------------------------------------------------
12141214cmake: generate
1215   $(SILENT) $(GENIE) $(PARAMS) cmake
1215   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) cmake
12161216ifeq ($(OS),windows)
12171217   $(SILENT)echo cmake_minimum_required(VERSION 2.8.4) > CMakeLists.txt
12181218   $(SILENT)echo add_subdirectory($(PROJECTDIR)/cmake) >> CMakeLists.txt

https://github.com/mamedev/mame/commit/e1e91bd7cec8c744d495c3d2499a8dfb5038dbfc

Previous 199869 Revisions Next

© 1997-2024 The MAME Team