Changeset 53 for trunk/mediafolder

Timestamp:

May 7, 2023, 10:36:01 PM (2 years ago)

Author:

gyoung

Message:

Make file changes to get it to build

Location:

trunk/mediafolder

Files:

• ProgFolder/makefile (modified) (3 diffs)
• c/cddb/makefile (modified) (3 diffs)
• c/cddb/res/makefile (modified) (6 diffs)
• makefile (modified) (2 diffs)
• res/makefile (modified) (1 diff)

trunk/mediafolder/ProgFolder/makefile

@@ -47 +47 @@
 # */
 
-include ../make.inc
+include ../../make.inc
 
 
@@ -69 +69 @@
                 rc -i $(INC2) progfolder.rc progfolder.dll
                 implib /NOLOGO progfldr.lib progfolder.def
+                cp progfolder.dll ../bin/progfldr.dll
                 
 progfolder.obj:         progfolder.cpp $(INC)/progfolder.hh $(INC)/progfolder.h
@@ -91 +92 @@
         -rm *.flc
 
-distribution:
-        -cp progfolder.dll $(DLLDIR)/progfldr.dll
+#distribution:
+#       -cp progfolder.dll $(DLLDIR)/progfldr.dll
 
-

trunk/mediafolder/c/cddb/makefile

@@ -17 +17 @@
 BINDIR          =       ../../dist/bin
 HELPERDIR       =       ..\helper
-OBJECTS         =       cddb.obj \
-                        cd.obj \
-                        helper.obj \
-                        cddbhelper.obj \
-                        message.obj
+OBJECTS         =       cddb.o \
+                        cd.o \
+                        helper.o \
+                        cddbhelper.o \
+                        message.o
 LIBOBJECTS      = $(LIBDIR)/sys_funcs.obj
 
@@ -32 +32 @@
 
 pmdb001.dll:    ./res/pmcddb001.c ./res/pmcddb001.res
+                cd ./Res && make
                 -rm pmdb001.dll
                 cp ./res/pmcddb001.dll pmdb001.dll
@@ -82 +83 @@
 
 pmcddb.exe:     pmcddb.cc $(OBJECTS) $(LIBOBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh
-        $(CC) $< $(CPPFLAGS) -I$(INC) -I$(MOREINC) $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ)  -lsocket pmcddb.def
+        $(CC) $< $(CPPFLAGS) -I$(INC) -I$(MOREINC) $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ)  -lsocket -lstdc++6_dll.lib pmcddb.def
 
 cddb.obj:       cddb.cpp $(INC)\cddb.hh

trunk/mediafolder/c/cddb/res/makefile

@@ -3 +3 @@
 CC           = icc
 #CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+
-CPPFLAGS  =  -Zdll -Zmt -Zno-rte
+CPPFLAGS  =  -Zdll -Zmt
 INC             = ../../../include
 DEFS         = 
@@ -18 +18 @@
 
 pmcddb001.dll:  pmcddb001.c pmcddb001.res
-                gcc -Zdll -Zomf -Zno-rte -I$(INC) pmcddb001.c pmcddb001.def
+                gcc -Zdll -Zomf -I$(INC) pmcddb001.c pmcddb001.def
                 rc pmcddb001.res pmcddb001.dll
 #               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb001.def
@@ -27 +27 @@
 
 pmcddb049.dll:  pmcddb049.c pmcddb049.res
-                gcc -Zdll -Zomf -Zno-rte -I$(INC) pmcddb049.c pmcddb049.def
+                gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def
                 rc pmcddb049.res pmcddb049.dll
 #               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
@@ -35 +35 @@
 
 pmcddb031.dll:  pmcddb031.c pmcddb031.res
-                gcc -Zdll -Zomf -Zno-rte -I$(INC) pmcddb031.c pmcddb031.def
+                gcc -Zdll -Zomf -I$(INC) pmcddb031.c pmcddb031.def
                 rc pmcddb031.res pmcddb031.dll
 #               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
@@ -43 +43 @@
 
 pmcddb039.dll:  pmcddb039.c pmcddb039.res
-                gcc -Zdll -Zomf -Zno-rte -I$(INC) pmcddb039.c pmcddb039.def
+                gcc -Zdll -Zomf -I$(INC) pmcddb039.c pmcddb039.def
                 rc pmcddb039.res pmcddb039.dll
 #               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
@@ -51 +51 @@
 
 pmcddb088.dll:  pmcddb088.c pmcddb088.res
-                gcc -Zdll -Zomf -Zno-rte -I$(INC) pmcddb088.c pmcddb088.def
+                gcc -Zdll -Zomf -I$(INC) pmcddb088.c pmcddb088.def
                 rc pmcddb088.res pmcddb088.dll
 

trunk/mediafolder/makefile

@@ -78 +78 @@
         prog_tutorial\mediafldrprog.inf ./c/createcd/createcd.exe
         cd ./c/cddb && make
+        cd ./progfolder && make
         -cd ./help && make
 
@@ -121 +122 @@
         $(COMPILE)
 
-mediafolder.dll:        $(OBJECTS) progfldr.lib $(INC)\mediafolderres.h ./res/mediafolder.res
+mediafolder.dll:        $(OBJECTS) progfolder\progfolder.def $(INC)\mediafolderres.h ./res/mediafolder.res
                 -cd ../. && make bld
                 @create_mfldr_def.CMD mediafolder.DEF
-                icc -Ge- /Q+ /D$(ECS) /FM $(OBJECTS) progfldr.lib $(LIBS) mediafolder.def
+                implib /NOLOGO lib\progfldr.lib progfolder\progfolder.def
+                icc -Ge- /Q+ /D$(ECS) /FM $(OBJECTS) lib\progfldr.lib $(LIBS) mediafolder.def
                 rc ./res/mediafolder.res $@ 
                 MAPSYM mediafolder

trunk/mediafolder/res/makefile

@@ -46 +46 @@
                                                 $(INC)\mediafolderres.h \
                                                 ../../build.inc
-                cd ./$(LANGUAGE) && rc -D $(ECS) -i ../$(INC) -i ../$(OBJDIR) -r mediafolder_$(LANGUAGE).rc
+                cd ./$(LANGUAGE) && rc -D $(ECS) -i ../$(INC2) -i ../$(OBJDIR) -r mediafolder_$(LANGUAGE).rc
                 cp ./$(LANGUAGE)/mediafolder_$(LANGUAGE).res ./obj/
                 -rm ./$(LANGUAGE)/mediafolder_$(LANGUAGE).res