1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172
|
--- a/build/src/gcc.mak 2008-02-10 20:20:18.770634949 +0800
+++ b/build/src/gcc.mak 2008-02-10 20:28:45.245251861 +0800
@@ -8,52 +8,52 @@
#==========================================================================
## choose your target: cygwin, mingw, linux, freebsd, darwin
-MACH_TYPE = mingw
+MACH_TYPE = linux
## output name
SHIORI = shiori
## if you have 'upx' and want to use it
# UPX = upx
-UPX = upx
+UPX = touch
## if you want to use STLport, set STLport=yes
-# STLport = yes
+STLport ?= no
## if you want to use native SAORI, set SAORI_NATIVE=yes (default)
SAORI_NATIVE = yes
## if you want to use Python SAORI, set SAORI_PYTHON=yes
-# SAORI_PYTHON = yes
+SAORI_PYTHON = yes
## if you want to use Java SAORI, set SAORI_JAVA=yes
-# SAORI_JAVA = yes
+SAORI_JAVA = no
## if you want to make a Python SHIORI, set SHIORI_PYTHON=yes
-# SHIORI_PYTHON = yes
+SHIORI_PYTHON = yes
## Global options
-CFLAGS = -O1 -I. -DNDEBUG -Wall -fomit-frame-pointer
-LDFLAGS = -s
+MYCFLAGS = -O1 -I. -DNDEBUG -fPIC -fno-strict-aliasing -Wall -fomit-frame-pointer $(CFLAGS)
+MYLDFLAGS = $(LDFLAGS)
#==========================================================================
# Directories
#==========================================================================
## STLport specific options
-CFLAGS_STLP = -I/MinGW/include/stlport
-LDFLAGS_STLP =
-LIBS_STLP = -lstlport_r50_static
+CFLAGS_STLP = -I/usr/include/stlport -pthread -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+LDFLAGS_STLP = -pthread -lstlport -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+LIBS_STLP = -pthread -lstlport
## Python specific options. These are only for Win32.
-# CFLAGS_PYTHON = -I/python23/include
-# LDFLAGS_PYTHON = -L/python23/lib
-# LIBS_PYTHON = -lpython23
+CFLAGS_PYTHON = $(shell python3-config --cflags)
+LDFLAGS_PYTHON = $(shell python3-config --ldflags --embed)
+LIBS_PYTHON = $(shell python3-config --libs --embed)
## Java specific options
-JAVA_HOME = /usr/java/j2sdk
-CFLAGS_JAVA = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/win32
-LDFLAGS_JAVA =
+JAVA_HOME = /usr/lib/jvm/default-java
+CFLAGS_JAVA = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+LDFLAGS_JAVA = -L$(JAVA_HOME)/lib -ljava -Xlinker -rpath -Xlinker $(JAVA_HOME)/lib
#==========================================================================
# Do not modify below
@@ -68,21 +68,22 @@
DYNIMPLIB = ../mach/$(MACH_TYPE)/$(SHIORI)$(LIBEXT_$(MACH_TYPE))
ifeq ($(STLport),yes)
- CFLAGS := $(CFLAGS_STLP) -DHAVE_SSTREAM $(CFLAGS)
- LDFLAGS := $(LDFLAGS) $(LDFLAGS_STLP)
+ MYCFLAGS := $(CFLAGS_STLP) -DHAVE_SSTREAM $(MYCFLAGS)
+ MYLDFLAGS := $(MYLDFLAGS) $(LDFLAGS_STLP)
LIBS := $(LIBS) $(LIBS_STLP)
endif
ifeq ($(SAORI_NATIVE),yes)
- CFLAGS := -DENABLE_SAORI_NATIVE $(CFLAGS)
+ MYCFLAGS := -DENABLE_SAORI_NATIVE $(MYCFLAGS)
CORESRC := $(CORESRC) $(CORESRC_NATIVE)
endif
ifeq ($(SAORI_JAVA),yes)
CORESRC := $(CORESRC) $(CORESRC_JAVA)
- CFLAGS := $(CFLAGS) $(CFLAGS_JAVA) -DENABLE_SAORI_JAVA
+ MYCFLAGS := $(MYCFLAGS) $(CFLAGS_JAVA) -DENABLE_SAORI_JAVA
+ MYLDFLAGS := $(MYLDFLAGS) $(LDFLAGS_JAVA)
ifeq ($(MACH_TYPE),mingw)
- LDFLAGS := $(LDFLAGS) -L$(MACH)
+ MYLDFLAGS := $(MYLDFLAGS) -L$(MACH)
LIBS := $(LIBS) -ljvm
DEPLIB := $(MACH)/libjvm.dll.a
endif
@@ -91,7 +92,7 @@
ifeq ($(SAORI_PYTHON),yes)
_LINK_PYTHON_ = 1
CORESRC := $(CORESRC) $(CORESRC_PYTHON)
- CFLAGS := -DENABLE_SAORI_PYTHON $(CFLAGS)
+ MYCFLAGS := -DENABLE_SAORI_PYTHON $(MYCFLAGS)
endif
ifeq ($(SHIORI_PYTHON),yes)
@@ -100,11 +101,14 @@
endif
ifdef _LINK_PYTHON_
- PYTHON_VER = $(shell python -c "import sys; print sys.version[:3]")
+ PYTHON_VER = $(shell python3 -c "import sys; print (sys.version[:3])")
ifndef CFLAGS_PYTHON
- CFLAGS_PYTHON = -I$(shell python -c "import sys; print sys.prefix+'/include/python'+sys.version[:3]")
- CFLAGS := $(CFLAGS_PYTHON) $(CFLAGS)
+ CFLAGS_PYTHON = -I$(shell python3 -c "import sys; print (sys.prefix+'/include/python'+sys.version[:3])")
+ MYCFLAGS := $(CFLAGS_PYTHON) $(MYCFLAGS)
LIBS := $(LIBS) -lpython$(PYTHON_VER)
+ else
+ MYCFLAGS := $(CFLAGS_PYTHON) $(MYCFLAGS)
+ LIBS := $(LIBS) $(LIBS_PYTHON)
endif
endif
@@ -115,8 +119,8 @@
KOSUISRC := $(KOSUISRC) $(KOSUISRC_$(MACH_TYPE))
# flags
-CFLAGS := $(CFLAGS_$(MACH_TYPE)) $(CFLAGS)
-LDFLAGS := $(LDFLAGS_$(MACH_TYPE)) $(LDFLAGS)
+MYCFLAGS := $(CFLAGS_$(MACH_TYPE)) $(MYCFLAGS)
+MYLDFLAGS := $(LDFLAGS_$(MACH_TYPE)) $(MYLDFLAGS)
LIBS := $(LIBS) $(LIBS_$(MACH_TYPE))
DYNLIBDEF := shiori_$(MACH_TYPE).def
@@ -148,19 +152,19 @@
all : $(ALLTARGET) upx
$(MACH)/$(DYNLIBPREFIX)$(SHIORI)$(DYNLIBEXT) : $(SHIOOBJ) $(COREOBJ) $(DEPLIB)
- $(CXX) -o$@ $(SHARED_$(MACH_TYPE)) $(LDFLAGS) $(SHIOOBJ) $(COREOBJ) $(LIBS)
+ $(CXX) -o$@ $(SHARED_$(MACH_TYPE)) $(MYLDFLAGS) $(SHIOOBJ) $(COREOBJ) $(LIBS)
$(MACH)/kosui$(EXEEXT) : $(KOSUIOBJ) $(COREOBJ) $(DEPLIB)
- $(CXX) -o$@ $(LDFLAGS) $(KOSUIOBJ) $(COREOBJ) $(LIBS)
+ $(CXX) -o$@ $(MYLDFLAGS) $(KOSUIOBJ) $(COREOBJ) $(LIBS)
$(MACH)/kawari_encode$(EXEEXT) : tool/kawari_encode$(OBJEXT) $(CRYPTOBJ)
- $(CXX) -o$@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
+ $(CXX) -o$@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(MYLDFLAGS)
$(MACH)/kawari_encode2$(EXEEXT) : tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ)
- $(CXX) -o$@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
+ $(CXX) -o$@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(MYLDFLAGS)
$(MACH)/kawari_decode2$(EXEEXT) : tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ)
- $(CXX) -o$@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
+ $(CXX) -o$@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(MYLDFLAGS)
$(MACH)/libjvm.dll.a : win32jvm.def
dlltool --def win32jvm.def -l $@ --dllname jvm.dll -k -C -a
@@ -168,7 +172,7 @@
.SUFFIXES : .cpp .h .a .def
%.o : %.cpp
- $(CXX) $(CFLAGS) -o$@ -c $<
+ $(CXX) $(MYCFLAGS) -o$@ -c $<
clean :
-rm $(COREOBJ) $(SHIOOBJ) $(KOSUIOBJ) $(TOOLOBJ) $(TEMPORARY_FILES)
|