Skip to content

Commit 956d048

Browse files
committed
Release 4.4
1 parent 1d0c0c4 commit 956d048

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# | LDPL Version Details |
55
# +----------------------+
66

7-
VERSION = '"4.4-dev"' #LDPL Version
7+
VERSION = '"4.4"' #LDPL Version
88
VERSIONNAME = '"Friendly Falcarius"' #LDPL Version Name
99

1010
# +-----------------+
@@ -15,11 +15,11 @@ OBJS = ldpl.o
1515
SOURCE = ldpl.cpp
1616
OUT = ldpl
1717
LPMLOCATION = "~/ldpl/lpm/"
18-
#ifneq ($(shell uname -s),Darwin)
19-
#ifeq ($(shell uname -o),Msys)
20-
#LPMLOCATION = "c:/ldpl/lpm/"
21-
#endif
22-
#endif
18+
# x86 cross compilation options (make x86=true)
19+
ifdef x86
20+
CROSS = -m32
21+
CROSS = -m32
22+
endif
2323
FLAGS = -g -c -Wall -std=gnu++11 -fpermissive -DVERSION=$(VERSION) -DVERSIONNAME=$(VERSIONNAME) -DCOMPILEDATE='"$(shell date +%Y-%m-%d)"' -DCOMPILEHOUR='"$(shell date +%H:%M:%S)"' -DLPMLOCATION='$(LPMLOCATION)'
2424
#Flags for static compilation on Windows and Linux (not Android)
2525
ifneq ($(shell uname -s),Darwin)
@@ -33,12 +33,12 @@ PREFIX := /usr/local
3333
endif
3434

3535
all: $(OBJS)
36-
$(CXX) -g $(OBJS) -o $(OUT) $(LFLAGS)
36+
$(CXX) -g $(OBJS) -o $(OUT) $(LFLAGS) $(CROSS)
3737
./ldpl ../lpm/lpm.ldpl -o=lpm
3838

3939
ldpl.o: ldpl.cpp ldpl_lib.cpp
4040
awk -f lib-to-string.awk ldpl_lib.cpp > ldpl_included_lib.cpp
41-
$(CXX) $(FLAGS) $(SOURCE)
41+
$(CXX) $(FLAGS) $(CROSS) $(SOURCE)
4242

4343

4444
clean:

0 commit comments

Comments
 (0)