Ignore:
Timestamp:
Oct 2, 2023, 11:34:35 PM (23 months ago)
Author:
gyoung
Message:

Remaining changes from merge with Lars 2.9 branch

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/mediafolder/c/cddb/makefile

    r53 r104  
    77#CPPFLAGSSTATIC     = -O -Zomf -Zsys -Zmt -s
    88
    9 CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+
     9CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl- /O+ /Oc+ /Ol- /Q+
    1010INC             = ../../include
    1111MOREINC         = $(COMMONSRC)/include
    12 DEFS         = 
    13 PROGS        = 
     12DEFS         =
     13PROGS        =
    1414ODIR            = .
    1515CPPDIR  = .
     
    2929all:     pmcddb.exe pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll
    3030
    31 nlv:    pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll 
     31nlv:    pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll
    3232
    3333pmdb001.dll:    ./res/pmcddb001.c ./res/pmcddb001.res
     
    3636                cp ./res/pmcddb001.dll pmdb001.dll
    3737
    38 ./res/pmcddb001.res:    ./res/pmcddb001.rc ./res/pmcddb001.dlg $(INC)/pmcddbres.h 
     38./res/pmcddb001.res:    ./res/pmcddb001.rc ./res/pmcddb001.dlg $(INC)/pmcddbres.h
    3939                cd ./Res && make
    4040
     
    4343                cp ./res/pmcddb049.dll pmdb049.dll
    4444
    45 ./res/pmcddb049.res:    ./res/pmcddb049.rc ./res/pmcddb049.dlg $(INC)/pmcddbres.h 
     45./res/pmcddb049.res:    ./res/pmcddb049.rc ./res/pmcddb049.dlg $(INC)/pmcddbres.h
    4646                cd ./Res && make
    4747
     
    5050                cp ./res/pmcddb031.dll pmdb031.dll
    5151
    52 ./res/pmcddb031.res:    ./res/pmcddb031.rc ./res/pmcddb031.dlg $(INC)/pmcddbres.h 
     52./res/pmcddb031.res:    ./res/pmcddb031.rc ./res/pmcddb031.dlg $(INC)/pmcddbres.h
    5353                cd ./Res && make
    5454
     
    5757                cp ./res/pmcddb039.dll pmdb039.dll
    5858
    59 ./res/pmcddb039.res:    ./res/pmcddb039.rc ./res/pmcddb039.dlg $(INC)/pmcddbres.h 
     59./res/pmcddb039.res:    ./res/pmcddb039.rc ./res/pmcddb039.dlg $(INC)/pmcddbres.h
    6060                cd ./Res && make
    6161
     
    6666                cp ./res/pmcddb088.dll pmdb088.dll
    6767
    68 ./res/pmcddb088.res:    ./res/pmcddb088.rc ./res/pmcddb088.dlg $(INC)/pmcddbres.h 
     68./res/pmcddb088.res:    ./res/pmcddb088.rc ./res/pmcddb088.dlg $(INC)/pmcddbres.h
    6969                cd ./Res && make
    7070
    7171
    72 $(LIBDIR)/%.obj:        $(COMMONSRC)/%.c 
    73         $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $< 
     72$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
     73        $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $<
    7474
    75 cd.obj: cd.c
     75cd.o:   cd.c
    7676                gcc -c $< -I$(INC) -Zcrtdll -Zomf
    7777
    78 helper.obj:     helper.c
     78helper.o:       helper.c
    7979                gcc -c $< -I$(INC) -Zcrtdll -Zomf
    8080
    81 message.obj:    message.c
     81message.o:      message.c
    8282                gcc -c $< -I$(INC) -Zcrtdll -Zomf
    8383
     
    8585        $(CC) $< $(CPPFLAGS) -I$(INC) -I$(MOREINC) $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ)  -lsocket -lstdc++6_dll.lib pmcddb.def
    8686
    87 cddb.obj:       cddb.cpp $(INC)\cddb.hh
     87cddb.o: cddb.cpp $(INC)\cddb.hh
    8888                gcc -c cddb.cpp -I$(INC) -Zcrtdll -Zomf
    8989
    90 cddbcls.obj:    cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h
     90cddbcls.o:      cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h
    9191                cd ../pm_launchers && make
    9292
    9393
    94 printHelper.obj:        printHelper.cpp
     94printHelper.o:  printHelper.cpp
    9595                gcc -c printHelper.cpp -I$(INC) -Zcrtdll -Zomf
    9696
    97 cddbhelper.obj: $(HELPERDIR)\cddbhelper.cpp
     97cddbhelper.o:   $(HELPERDIR)\cddbhelper.cpp
    9898                gcc -c $< -I$(INC) -Zcrtdll -Zomf
    9999
Note: See TracChangeset for help on using the changeset viewer.