| Revision | 1e0cdf4fa3e3f537385f8ad8054f3758050b60aa (tree) |
|---|---|
| Zeit | 2019-05-28 06:35:47 |
| Autor | AlaskanEmily <emily@alas...> |
| Commiter | AlaskanEmily |
Fix exports with MSVC
src/nmakefile (diff)| @@ -2,8 +2,8 @@ | ||
| 2 | 2 | # http://creativecommons.org/publicdomain/zero/1.0/ |
| 3 | 3 | |
| 4 | 4 | LINK=link |
| 5 | -LINKFLAGS=/NOLOGO /DLL /OUT:cinnamon.dll /PDB:cinnamon.pdb /DEF:cinnamon.def | |
| 6 | -CLFLAGS=/nologo /GF /EHsc /arch:SSE /Zi /c /WX /DCIN_INTERNAL /I$(MAKEDIR) /I$(MAKEDIR)\common /Os /W3 /DCIN_DLL=1 | |
| 5 | +LINKFLAGS=/NOLOGO /DLL /OUT:cinnamon.dll /PDB:cinnamon.pdb | |
| 6 | +CLFLAGS=/nologo /GF /EHsc /arch:SSE /Zi /c /WX /I"$(MAKEDIR)" /I"$(MAKEDIR)\common" /Os /W3 /DCIN_DLL=1 /DCIN_INTERNAL=1 | |
| 7 | 7 | LIBFLAGS=/NOLOGO |
| 8 | 8 | |
| 9 | 9 | all: dsound sine_test.exe aucat.exe |
| @@ -24,20 +24,32 @@ openal_lib: | ||
| 24 | 24 | dummy.obj: |
| 25 | 25 | cl $(CLFLAGS) /c /TP cinnamon.h /Fodummy.obj |
| 26 | 26 | |
| 27 | -dsound: dsound_lib common_lib dummy.obj cinnamon.def | |
| 28 | - $(LINK) /DEBUG dummy.obj dsound\cin_dsound.lib common\cin_common.lib dsound.lib dxguid.lib ole32.lib user32.lib $(LINKFLAGS) | |
| 27 | +dsound: dsound_lib common_lib dummy.obj | |
| 28 | + $(LINK) /DEBUG dummy.obj /WHOLEARCHIVE:dsound\cin_dsound.lib /WHOLEARCHIVE:common\cin_common.lib dsound.lib dxguid.lib ole32.lib user32.lib $(LINKFLAGS) | |
| 29 | 29 | |
| 30 | -openal: openal_lib common_lib dummy.obj cinnamon.def | |
| 31 | - $(LINK) /DEBUG dummy.obj openal\cin_openal.lib lib\OpenAL32.lib $(LINKFLAGS) | |
| 30 | +openal: openal_lib common_lib dummy.obj | |
| 31 | + $(LINK) /DEBUG dummy.obj /WHOLEARCHIVE:openal\cin_openal.lib lib\OpenAL32.lib $(LINKFLAGS) | |
| 32 | 32 | |
| 33 | -sine_test.obj: | |
| 33 | +sine_test.obj: sine_test.c cinnamon.h cin_export.h cin_format.h | |
| 34 | 34 | cl $(CLFLAGS) /c sine_test.c |
| 35 | 35 | |
| 36 | 36 | sine_test.exe: dsound sine_test.obj |
| 37 | 37 | $(LINK) /DEBUG sine_test.obj cinnamon.lib /NOLOGO /OUT:sine_test.exe |
| 38 | 38 | |
| 39 | -aucat.obj: | |
| 39 | +aucat.obj: aucat.c cinnamon.h cin_export.h cin_format.h | |
| 40 | 40 | cl $(CLFLAGS) /c aucat.c |
| 41 | 41 | |
| 42 | 42 | aucat.exe: dsound aucat.obj |
| 43 | 43 | $(LINK) /DEBUG aucat.obj cinnamon.lib /NOLOGO /OUT:aucat.exe |
| 44 | + | |
| 45 | +CLEANDIR=( del *.obj 2> nul || echo > nul ) && ( del *.lib 2> nul || echo > nul ) && ( del *.pdb 2> nul || echo > nul ) && ( del *.exp 2> nul || echo > nul ) | |
| 46 | + | |
| 47 | +clean: | |
| 48 | + @cd . && $(CLEANDIR) | |
| 49 | + @del *.exe 2> nul || echo > nul | |
| 50 | + @cd common && $(CLEANDIR) | |
| 51 | + @cd dsound && $(CLEANDIR) | |
| 52 | + @del *.obj 2> nul || echo > nul | |
| 53 | + @del *.lib 2> nul || echo > nul | |
| 54 | + @del *.pdb 2> nul || echo > nul | |
| 55 | + @del *.dll 2> nul || echo > nul |
Fork