Changeset 593

Show
Ignore:
Timestamp:
2004-09-24 01:13:09 (4 years ago)
Author:
silvia
Message:

Colin, I'm sorry to say your Makefile didn't work. I therefore got the old one back and fixed that up to work now. I'm gonna try and merge yours and mine to make a working better one, but this one will have to do for the next release.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • liboggz/trunk/win32/Makefile

    r543 r593  
     1# Set the value of $(MSVCDir) for your installation.  
     2# Please note that none of the directory names are allowed to have spaces  
     3# in them. You must use the short name  
     4# 
     5# "C:\Program Files\Microsoft Visual Studio\VC98" will not work. 
     6# "C:\Progra~1\Micros~1\VC98" will work. 
     7# MSVCDir="C:\PROGRA~1\MICROS~1.NET\Vc7" 
    18 
    2 CC = @cl 
    3 LD = @link 
    4 CFLAGS = /nologo /c /FD /W1 /YX /I"." /I"..\src\liboggz" /I"..\include" /I"..\..\ogg\include" /D "WIN32" 
    5 DLL_LFLAGS = /nologo ogg.lib /DLL /LIBPATH:"..\..\ogg\win32\Dynamic_Release" 
    6 EXE_LFLAGS = /nologo 
     9MSVCDir="C:\PROGRA~1\Micros~3\VC98" 
    710 
    8 !ifdef DEBUG 
    9 OBJ = Debug 
    10 CFLAGS = $(CFLAGS) /MDd /Od /Yd 
    11 !else 
    12 OBJ = Release 
    13 CFLAGS = $(CFLAGS) /MD /O2 
    14 !endif 
     11CPP=cl.exe 
     12LINK32=link.exe 
    1513 
    16 DLL = $(OBJ)\liboggz.dll 
     14LIBOGG_PATH="..\..\xiph.org\ogg\win32\Dynamic_Release" 
     15INCOGG_PATH="..\..\xiph.org\ogg\include" 
    1716 
    18 EXECUTABLES = $(OBJ)\oggzdump.exe $(OBJ)\oggzed.exe $(OBJ)\oggzinfo.exe $(OBJ)\oggzmerge.exe 
     17LINK32_FLAGS=$(LIBOGG_PATH)\ogg.lib /nologo /dll /incremental:no /libpath:"$(MSVCDir)\Lib" /implib:".\liboggz.lib" /machine:I386 /out:".\liboggz.dll"  
    1918 
    20 DLL_OBJECTS = $(OBJ)\oggz.obj $(OBJ)\oggz_io.obj $(OBJ)\oggz_read.obj $(OBJ)\oggz_write.obj \ 
    21         $(OBJ)\oggz_auto.obj $(OBJ)\oggz_table.obj $(OBJ)\oggz_vector.obj 
     19PROG_LINK_FLAGS=/nologo /incremental:no /libpath:"$(MSVCDir)\Lib" /machine:I386 /exetype:dynamic 
    2220 
    23 EXE_OBJECTS = $(OBJ)\oggzdump.obj $(OBJ)\oggzed.obj $(OBJ)\oggzinfo.obj $(OBJ)\oggzmerge.obj 
     21CFLAGS=/nologo /MD /W1 /GX /O2 /I"." /I"..\src\liboggz" /I"..\include" /I$(INCOGG_PATH) /I"$(MSVCDir)\Include"  /D "WIN32" /D "_USRDLL" /YX /FD 
    2422 
    25 All: $(OBJ) $(DLL) $(EXECUTABLES) 
    2623 
    27 $(OBJ): 
    28         @mkdir $(OBJ) 
     24#==================================================================== 
     25# Targets 
    2926 
    30 $(DLL): $(DLL_OBJECTS) 
    31         $(LD) $(DLL_OBJECTS) $(DLL_LFLAGS) /DEF:liboggz.def /IMPLIB:$*.lib /OUT:$@ 
     27ALL :  "attgetopt.obj" "liboggz.dll" "oggzdump.exe" "oggzinfo.exe" "oggzed.exe" 
    3228 
    33 $(OBJ)\oggzdump.exe : $(OBJ)\oggzdump.obj $(OBJ)\attgetopt.obj 
    34         @echo Linking $@... 
    35         $(LD) $*.obj $(OBJ)\attgetopt.obj $(EXE_LFLAGS) $(OBJ)\liboggz.lib /OUT:$@ 
     29CLEAN: 
     30        -@erase ".\*.obj" 
     31        -@erase ".\vc60.idb" 
     32        -@erase ".\liboggz.dll" 
     33        -@erase ".\liboggz.exp" 
     34        -@erase ".\liboggz.lib" 
    3635 
    37 $(OBJ)\oggzed.exe : $(OBJ)\oggzed.obj $(OBJ)\attgetopt.obj 
    38         @echo Linking $@... 
    39         $(LD) $*.obj $(OBJ)\attgetopt.obj $(EXE_LFLAGS) $(OBJ)\liboggz.lib /OUT:$@ 
     36#==================================================================== 
    4037 
    41 $(OBJ)\oggzinfo.exe : $(OBJ)\oggzinfo.obj $(OBJ)\attgetopt.obj 
    42         @echo Linking $@... 
    43         $(LD) $*.obj $(OBJ)\attgetopt.obj $(EXE_LFLAGS) $(OBJ)\liboggz.lib /OUT:$@ 
     38LINK32_OBJS= \ 
     39        ".\oggz.obj" \ 
     40        ".\oggz_io.obj" \ 
     41        ".\oggz_read.obj" \ 
     42        ".\oggz_write.obj" \ 
     43        ".\oggz_auto.obj" \ 
     44        ".\oggz_table.obj" \ 
     45        ".\oggz_vector.obj" 
    4446 
    45 $(OBJ)\oggzmerge.exe : $(OBJ)\oggzmerge.obj $(OBJ)\attgetopt.obj 
    46         @echo Linking $@... 
    47         $(LD) $*.obj $(OBJ)\attgetopt.obj $(EXE_LFLAGS) $(OBJ)\liboggz.lib /OUT:$@ 
     47"liboggz.dll" : $(LINK32_OBJS) ".\liboggz.def" 
     48    $(LINK32) $(LINK32_FLAGS) /def:".\liboggz.def" $(LINK32_OBJS) 
    4849 
    49 {..\src\liboggz}.c{$(OBJ)}.obj : 
    50         $(CC) $(CFLAGS) /Fo$*.obj $< 
     50"oggzdump.exe" : "..\src\tools\oggzdump.c" 
     51        $(CPP) $(CFLAGS) /Fo".\oggzdump.obj" /c "..\src\tools\oggzdump.c" 
     52        $(LINK32) $(PROG_LINK_FLAGS) /out:"oggzdump.exe" ".\oggzdump.obj" ".\attgetopt.obj" liboggz.lib 
    5153 
    52 {..\src\tools}.c{$(OBJ)}.obj : 
    53         $(CC) $(CFLAGS) /Fo$*.obj $< 
     54"oggzinfo.exe" : "..\src\tools\oggzinfo.c" 
     55        $(CPP) $(CFLAGS) /Fo".\oggzinfo.obj" /c "..\src\tools\oggzinfo.c" 
     56        $(LINK32) $(PROG_LINK_FLAGS) /out:"oggzinfo.exe" ".\oggzinfo.obj" ".\attgetopt.obj" liboggz.lib 
    5457 
    55 .c{$(OBJ)}.obj : 
    56         $(CC) $(CFLAGS) /Fo$*.obj $< 
     58"oggzed.exe" : "..\src\tools\oggzed.c" 
     59        $(CPP) $(CFLAGS) /Fo".\oggzed.obj" /c "..\src\tools\oggzed.c" 
     60        $(LINK32) $(PROG_LINK_FLAGS) /out:"oggzed.exe" ".\oggzed.obj" ".\attgetopt.obj" liboggz.lib 
    5761 
    58 clean: 
    59         @del /sexyq $(OBJ) 
    60         @del /q vc60.* 
     62#==================================================================== 
     63# C files in src 
     64 
     65.\oggz.obj: 
     66        $(CPP) $(CFLAGS) /Fo".\oggz.obj" /c "..\src\liboggz\oggz.c" 
     67 
     68.\oggz_io.obj: 
     69        $(CPP) $(CFLAGS) /Fo".\oggz_io.obj" /c "..\src\liboggz\oggz_io.c" 
     70 
     71.\oggz_read.obj: 
     72        $(CPP) $(CFLAGS) /Fo".\oggz_read.obj" /c "..\src\liboggz\oggz_read.c" 
     73 
     74.\oggz_write.obj: 
     75        $(CPP) $(CFLAGS) /Fo".\oggz_write.obj" /c "..\src\liboggz\oggz_write.c" 
     76 
     77.\oggz_auto.obj: 
     78        $(CPP) $(CFLAGS) /Fo".\oggz_auto.obj" /c "..\src\liboggz\oggz_auto.c" 
     79 
     80.\oggz_table.obj: 
     81        $(CPP) $(CFLAGS) /Fo".\oggz_table.obj" /c "..\src\liboggz\oggz_table.c" 
     82 
     83.\oggz_vector.obj: 
     84        $(CPP) $(CFLAGS) /Fo".\oggz_vector.obj" /c "..\src\liboggz\oggz_vector.c" 
     85 
     86.\attgetopt.obj: 
     87        $(CPP) $(CFLAGS) /Fo".\attgetopt.obj" /c ".\attgetopt.c" 
     88 
     89# End of Makefile 
     90#==================================================================== 
     91