diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-02-15 17:07:46 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-02-15 17:07:46 +0000 |
| commit | 0d870f980d842502ae7ae8ee4eb7d368b1e717ab (patch) | |
| tree | f13a335b257550bde0d93808f3bea679a40e3776 /trunk/win | |
| parent | 4e93935929d654b064dd9a3f18aadc2aa3e98a7c (diff) | |
Keep dllexport symbols out of static lib
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@107 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/win')
| -rwxr-xr-x | trunk/win/Makefile | 5 | ||||
| -rwxr-xr-x | trunk/win/Makerules | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/trunk/win/Makefile b/trunk/win/Makefile index ebcc43d..76dcf80 100755 --- a/trunk/win/Makefile +++ b/trunk/win/Makefile @@ -174,7 +174,10 @@ wrjpgcom.exe: wrjpgcom.obj jpeg.lib turbojpeg-static.lib: turbojpegl.obj $(LOBJS) $(AR) -out:$@ $^ -turbojpeg.dll turbojpeg.lib: turbojpegl.obj $(LOBJS) +turbojpeg-dll.obj: turbojpegl.c + $(CC) $(CFLAGS) -DDLLDEFINE -c $< -Fo$@ + +turbojpeg.dll turbojpeg.lib: turbojpeg-dll.obj $(LOBJS) $(LINK) $(LDFLAGS) -dll -out:turbojpeg.dll -implib:turbojpeg.lib $^ diff --git a/trunk/win/Makerules b/trunk/win/Makerules index f4e18cd..f122593 100755 --- a/trunk/win/Makerules +++ b/trunk/win/Makerules @@ -9,7 +9,7 @@ ifeq ($(NASM),) NASM = nasm endif -CFLAGS = -W3 -wd4996 -Iwin -I. -DDLLDEFINE +CFLAGS = -W3 -wd4996 -Iwin -I. CDEFINES = -DWIN32 -D_CRT_SECURE_NO_DEPRECATE NAFLAGS = -fwin32 -DWIN32 -Iwin/ ifeq ($(DEBUG), yes) |