Skip to content

enable building dll's using makefile.msvc #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

enable building dll's using makefile.msvc #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
*.gcda
*.gcno
*.gcov
*.dll
*.exp
*.pdb
*.lib
*.tmp
[Dd]ebug/
Expand Down
19 changes: 14 additions & 5 deletions makefile.msvc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@
#The following can be overridden from command line e.g. make -f makefile.msvc CC=gcc ARFLAGS=rcs
PREFIX = c:\devel
CFLAGS = /Ox
LDFLAGS =

#Compilation flags
LTM_CFLAGS = /nologo /I./ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /D__STDC_WANT_SECURE_LIB__=1 /D_CRT_HAS_CXX17=0 /Wall /wd4146 /wd4127 /wd4668 /wd4710 /wd4711 /wd4820 /wd5045 /WX $(CFLAGS)
LTM_LDFLAGS = advapi32.lib
LTM_LDFLAGS = $(LDFLAGS) advapi32.lib

#Libraries to be created (this makefile builds only static libraries)
LIBMAIN_S =tommath.lib
#Libraries to be created
LIBMAIN_S = tommath.lib
LIBMAIN_I = tommath.dll.lib
LIBMAIN_D = tommath.dll

#List of objects to compile (all goes to tommath.lib)
OBJECTS=mp_2expt.obj mp_abs.obj mp_add.obj mp_add_d.obj mp_addmod.obj mp_and.obj mp_clamp.obj mp_clear.obj mp_clear_multi.obj \
Expand Down Expand Up @@ -62,12 +65,16 @@ $(OBJECTS): $(HEADERS)
$(LIBMAIN_S): $(OBJECTS)
lib /out:$(LIBMAIN_S) $(OBJECTS)

#Create DLL + import library tommath.dll.lib
$(LIBMAIN_D) $(LIBMAIN_I): $(OBJECTS) tommath.def
link /dll /out:$(LIBMAIN_D) /implib:$(LIBMAIN_I) /def:tommath.def $(LTM_LDFLAGS) $(OBJECTS)

#Build test suite
test.exe: $(LIBMAIN_S) demo/shared.obj demo/test.obj
cl $(LTM_CFLAGS) $(TOBJECTS) $(LIBMAIN_S) $(LTM_LDFLAGS) demo/shared.c demo/test.c /Fe$@
@echo NOTICE: start the tests by launching test.exe

all: $(LIBMAIN_S) test.exe
all: $(LIBMAIN_S) test.exe $(LIBMAIN_D)

tune: $(LIBMAIN_S)
$(MAKE) -C etc tune
Expand All @@ -77,9 +84,11 @@ clean:
@-cmd /c del /Q /S *.OBJ *.LIB *.EXE *.DLL 2>nul

#Install the library + headers
install: $(LIBMAIN_S)
install: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D)
cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
cmd /c if not exist "$(PREFIX)\lib" mkdir "$(PREFIX)\lib"
cmd /c if not exist "$(PREFIX)\include" mkdir "$(PREFIX)\include"
copy /Y $(LIBMAIN_S) "$(PREFIX)\lib"
copy /Y $(LIBMAIN_I) "$(PREFIX)\lib"
copy /Y $(LIBMAIN_D) "$(PREFIX)\bin"
copy /Y tommath*.h "$(PREFIX)\include"
23 changes: 23 additions & 0 deletions s_mp_rand_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ static mp_err s_read_arc4random(void *p, size_t n)
arc4random_buf(p, n);
return MP_OKAY;
}
#else
static mp_err s_read_arc4random(void *p, size_t n)
{
(void)p;
(void)n;
return MP_ERR;
}
#endif

#if defined(_WIN32)
Expand Down Expand Up @@ -72,6 +79,15 @@ static mp_err s_read_getrandom(void *p, size_t n)
#endif
#endif

#ifndef S_READ_GETRANDOM_C
static mp_err s_read_getrandom(void *p, size_t n)
{
(void)p;
(void)n;
return MP_ERR;
}
#endif

/* We assume all platforms besides windows provide "/dev/urandom".
* In case yours doesn't, define MP_NO_DEV_URANDOM at compile-time.
*/
Expand Down Expand Up @@ -110,6 +126,13 @@ static mp_err s_read_urandom(void *p, size_t n)
close(fd);
return MP_OKAY;
}
#else
static mp_err s_read_urandom(void *p, size_t n)
{
(void)p;
(void)n;
return MP_ERR;
}
#endif

mp_err s_read_arc4random(void *p, size_t n);
Expand Down
5 changes: 5 additions & 0 deletions tommath.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ EXPORTS
mp_radix_size
mp_radix_size_overestimate
mp_rand
mp_rand_source
mp_read_radix
mp_reduce
mp_reduce_2k
Expand Down Expand Up @@ -124,3 +125,7 @@ EXPORTS
mp_unpack
mp_xor
mp_zero
MP_MUL_KARATSUBA_CUTOFF
MP_SQR_KARATSUBA_CUTOFF
MP_MUL_TOOM_CUTOFF
MP_SQR_TOOM_CUTOFF