Skip to content

Commit 73f2240

Browse files
bilambilam
committed
windows makefile
1 parent 352b7df commit 73f2240

4 files changed

Lines changed: 26 additions & 24 deletions

File tree

‎make2/build_jamalgam.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -777,10 +777,10 @@ case $jplatform64 in
777777
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden -Wno-psabi $DOLECOM -m32 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 "
778778
LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -lpsapi -luuid $LDTHREAD $LDOPENMP "
779779
if [ $jolecom -eq 1 ]; then
780-
DLLOBJS=" jdll.o jdllcomx.o "
780+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
781781
LIBJDEF=" ../../../../dllsrc/jdll.def "
782782
else
783-
DLLOBJS=" jdll.o "
783+
DLLOBJS=" ../../../../dllsrc/jdll.o "
784784
LIBJDEF=" ../../../../dllsrc/jdll2.def "
785785
fi
786786
LIBJRES=" jdllres.o "
@@ -802,10 +802,10 @@ case $jplatform64 in
802802
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
803803
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
804804
if [ $jolecom -eq 1 ]; then
805-
DLLOBJS=" jdll.o jdllcomx.o "
805+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
806806
LIBJDEF=" ../../../../dllsrc/jdll.def "
807807
else
808-
DLLOBJS=" jdll.o "
808+
DLLOBJS=" ../../../../dllsrc/jdll.o "
809809
LIBJDEF=" ../../../../dllsrc/jdll2.def "
810810
fi
811811
LIBJRES=" jdllres.o "
@@ -828,10 +828,10 @@ case $jplatform64 in
828828
LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
829829
CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
830830
if [ $jolecom -eq 1 ]; then
831-
DLLOBJS=" jdll.o jdllcomx.o "
831+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
832832
LIBJDEF=" ../../../../dllsrc/jdll.def "
833833
else
834-
DLLOBJS=" jdll.o "
834+
DLLOBJS=" ../../../../dllsrc/jdll.o "
835835
LIBJDEF=" ../../../../dllsrc/jdll2.def "
836836
fi
837837
LIBJRES=" jdllres.o "
@@ -855,10 +855,10 @@ case $jplatform64 in
855855
LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
856856
CFLAGS_SIMD=" -march=skylake -mtune=skylake -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
857857
if [ $jolecom -eq 1 ]; then
858-
DLLOBJS=" jdll.o jdllcomx.o "
858+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
859859
LIBJDEF=" ../../../../dllsrc/jdll.def "
860860
else
861-
DLLOBJS=" jdll.o "
861+
DLLOBJS=" ../../../../dllsrc/jdll.o "
862862
LIBJDEF=" ../../../../dllsrc/jdll2.def "
863863
fi
864864
LIBJRES=" jdllres.o "
@@ -881,10 +881,10 @@ case $jplatform64 in
881881
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
882882
LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
883883
if [ $jolecom -eq 1 ]; then
884-
DLLOBJS=" jdll.o jdllcomx.o "
884+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
885885
LIBJDEF=" ../../../../dllsrc/jdll.def "
886886
else
887-
DLLOBJS=" jdll.o "
887+
DLLOBJS=" ../../../../dllsrc/jdll.o "
888888
LIBJDEF=" ../../../../dllsrc/jdll2.def "
889889
fi
890890
LIBJRES=" jdllres.o "
@@ -930,7 +930,7 @@ fi
930930
mkdir -p ../bin/$jplatform64
931931
mkdir -p obj/$jplatform64/
932932
cp makefile-jamalgam obj/$jplatform64/.
933-
export BACKTRACE_OBJS CFLAGS CPPFLAGS LDFLAGS TARGET CFLAGS_SIMD GASM_FLAGS NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_ASM SRC_ASM OBJSLN jplatform j64x jplatform64 WINDRES
933+
export BACKTRACE_OBJS CFLAGS CPPFLAGS LDFLAGS TARGET CFLAGS_SIMD GASM_FLAGS NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES WINDRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_ASM SRC_ASM OBJSLN jplatform j64x jplatform64
934934
cd obj/$jplatform64/
935935
if [ "x$MAKEFLAGS" = x'' ]; then
936936
if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then

‎make2/build_libj.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -738,10 +738,10 @@ case $jplatform64 in
738738
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden -Wno-psabi $DOLECOM -m32 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 "
739739
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -lpsapi -luuid $LDTHREAD $LDOPENMP "
740740
if [ $jolecom -eq 1 ]; then
741-
DLLOBJS=" jdll.o jdllcomx.o "
741+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
742742
LIBJDEF=" ../../../../dllsrc/jdll.def "
743743
else
744-
DLLOBJS=" jdll.o "
744+
DLLOBJS=" ../../../../dllsrc/jdll.o "
745745
LIBJDEF=" ../../../../dllsrc/jdll2.def "
746746
fi
747747
LIBJRES=" jdllres.o "
@@ -763,10 +763,10 @@ case $jplatform64 in
763763
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
764764
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
765765
if [ $jolecom -eq 1 ]; then
766-
DLLOBJS=" jdll.o jdllcomx.o "
766+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
767767
LIBJDEF=" ../../../../dllsrc/jdll.def "
768768
else
769-
DLLOBJS=" jdll.o "
769+
DLLOBJS=" ../../../../dllsrc/jdll.o "
770770
LIBJDEF=" ../../../../dllsrc/jdll2.def "
771771
fi
772772
LIBJRES=" jdllres.o "
@@ -789,10 +789,10 @@ case $jplatform64 in
789789
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
790790
CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
791791
if [ $jolecom -eq 1 ]; then
792-
DLLOBJS=" jdll.o jdllcomx.o "
792+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
793793
LIBJDEF=" ../../../../dllsrc/jdll.def "
794794
else
795-
DLLOBJS=" jdll.o "
795+
DLLOBJS=" ../../../../dllsrc/jdll.o "
796796
LIBJDEF=" ../../../../dllsrc/jdll2.def "
797797
fi
798798
LIBJRES=" jdllres.o "
@@ -817,10 +817,10 @@ case $jplatform64 in
817817
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
818818
CFLAGS_SIMD=" -march=skylake -mtune=skylake -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
819819
if [ $jolecom -eq 1 ]; then
820-
DLLOBJS=" jdll.o jdllcomx.o "
820+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
821821
LIBJDEF=" ../../../../dllsrc/jdll.def "
822822
else
823-
DLLOBJS=" jdll.o "
823+
DLLOBJS=" ../../../../dllsrc/jdll.o "
824824
LIBJDEF=" ../../../../dllsrc/jdll2.def "
825825
fi
826826
LIBJRES=" jdllres.o "
@@ -843,10 +843,10 @@ case $jplatform64 in
843843
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
844844
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
845845
if [ $jolecom -eq 1 ]; then
846-
DLLOBJS=" jdll.o jdllcomx.o "
846+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
847847
LIBJDEF=" ../../../../dllsrc/jdll.def "
848848
else
849-
DLLOBJS=" jdll.o "
849+
DLLOBJS=" ../../../../dllsrc/jdll.o "
850850
LIBJDEF=" ../../../../dllsrc/jdll2.def "
851851
fi
852852
LIBJRES=" jdllres.o "
@@ -885,7 +885,7 @@ fi
885885
mkdir -p ../bin/$jplatform64
886886
mkdir -p obj/$jplatform64/
887887
cp makefile-libj obj/$jplatform64/.
888-
export CC AR CFLAGS CPPFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a CFLAGS_SIMD GASM_FLAGS NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_SIMDUTF8 OBJS_ASM SRC_ASM jplatform j64x jplatform64 WINDRES LDFLAGS_b
888+
export CC AR CFLAGS CPPFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a CFLAGS_SIMD GASM_FLAGS NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES WINDRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_SIMDUTF8 OBJS_ASM SRC_ASM jplatform j64x jplatform64 WINDRES LDFLAGS_b
889889
cd obj/$jplatform64/
890890
if [ "x$MAKEFLAGS" = x'' ]; then
891891
if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then

‎make2/build_tsdll.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,14 @@ case $jplatform64 in
247247
TARGET=tsdll.dll
248248
CFLAGS="$common -Wno-psabi -m32 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 "
249249
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -m32 -lm -static-libgcc -static-libstdc++ "
250+
LIBJDEF=" ../../../../makevs/tsdll/tsdll.def
250251
;;
251252
252253
windows/j64*) # windows intel 64bit
253254
TARGET=tsdll.dll
254255
CFLAGS="$common -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
255256
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ "
257+
LIBJDEF=" ../../../../makevs/tsdll/tsdll.def
256258
;;
257259

258260
*)
@@ -266,7 +268,7 @@ echo "CFLAGS=$CFLAGS"
266268
mkdir -p ../bin/$jplatform64
267269
mkdir -p obj/$jplatform64/
268270
cp makefile-tsdll obj/$jplatform64/.
269-
export CC AR CFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a jplatform j64x jplatform64
271+
export CC AR CFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a LIBJDEF jplatform j64x jplatform64
270272
cd obj/$jplatform64/
271273
if [ "x$MAKEFLAGS" = x'' ]; then
272274
if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then

‎make2/makefile-tsdll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ OBJS= \
1212

1313
ifdef TARGET
1414
$(ODIR)/$(TARGET) : $(OBJS)
15-
$(CC) -o $@ $(OBJS) $(LDFLAGS)
15+
$(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBJDEF)
1616
endif
1717

1818
ifdef TARGET_a

0 commit comments

Comments
 (0)