diff options
| author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2010-02-15 17:07:46 +0000 |
|---|---|---|
| committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2010-02-15 17:07:46 +0000 |
| commit | c1326f25546be0637bb952b64b5676162f2c1f9a (patch) | |
| tree | 413ee63ddf49c1cfb127fabcd40ffab90d34c5dc /win | |
| parent | 16961a3097b85a28f722beb81548db2f478f2b18 (diff) | |
Keep dllexport symbols out of static lib
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@107 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'win')
| -rwxr-xr-x | win/Makefile | 5 | ||||
| -rwxr-xr-x | win/Makerules | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/win/Makefile b/win/Makefile index ebcc43d..76dcf80 100755 --- a/win/Makefile +++ b/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/win/Makerules b/win/Makerules index f4e18cd..f122593 100755 --- a/win/Makerules +++ b/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) |