haikuprojects/Yab2Cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix x86x86_64 build

Browse Source
This commit is contained in:
Jim Saxton
2017-01-31 12:21:20 -08:00
parent 786b55591d
commit c1fbbdd63c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile
View File

@@ -21,7 +21,7 @@ HAIKUOPT = -DHAIKU -DLIBRARY_PATH=\"`finddir B_USER_SETTINGS_DIRECTORY`/yab\"
## ##
## Find haiku systenm archetecture from the package file name ## Find haiku systenm archetecture from the package file name
## ##
SYSTEMARCH:= $(shell catattr SYS:PACKAGE_FILE /boot/system/kernel_x86|cut --fields=4 -d-|cut -d. --fields 1) SYSTEMARCH:= $(shell catattr SYS:PACKAGE_FILE /boot/system/kernel_x86*|cut --fields=4 -d-|cut -d. --fields 1)
# #
## ##
@@ -74,6 +74,9 @@ ifeq ($(USEDARCH), x86)
else else
LD = ld LD = ld
endif endif
ifeq ($(SYSTEMARCH),x86_64)
LD=gcc
endif
# #
LD_OPT = -shared LD_OPT = -shared
@@ -178,4 +181,4 @@ install: yab $(YABLIBRARY)
cp -f yab /boot/system/non-packaged/bin$(ARCHADD)/ cp -f yab /boot/system/non-packaged/bin$(ARCHADD)/
cp -f $(YABLIBRARY) /boot/system/non-packaged/lib$(ARCHADD)/ cp -f $(YABLIBRARY) /boot/system/non-packaged/lib$(ARCHADD)/
cp -f $(YABLIBRARY) /boot/system/non-packaged/develop/lib$(ARCHADD)/ cp -f $(YABLIBRARY) /boot/system/non-packaged/develop/lib$(ARCHADD)/