From 7affe3d78d5473027104cb3b3008d5afb7ac47ea Mon Sep 17 00:00:00 2001 From: Philip Muzzall Date: Sun, 30 Jun 2019 22:01:04 -0700 Subject: [PATCH] Added rc scripts for dll (#306) * Added rc scripts for dll * Reverted numbering scheme in CMakeLists --- CMakeLists.txt | 7 ++++++- resources/openal32.rc | Bin 0 -> 4134 bytes resources/resource.h | 15 +++++++++++++++ resources/router.rc | Bin 0 -> 4108 bytes resources/soft_oal.rc | Bin 0 -> 4134 bytes version.h.in | 1 + 6 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 resources/openal32.rc create mode 100644 resources/resource.h create mode 100644 resources/router.rc create mode 100644 resources/soft_oal.rc diff --git a/CMakeLists.txt b/CMakeLists.txt index 13a714ac..a2150846 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,6 +109,7 @@ SET(LIB_MAJOR_VERSION "1") SET(LIB_MINOR_VERSION "19") SET(LIB_REVISION "1") SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_REVISION}") +SET(LIB_VERSION_NUM ${LIB_MAJOR_VERSION},${LIB_MINOR_VERSION},${LIB_REVISION},0) SET(EXPORT_DECL "") @@ -1131,6 +1132,7 @@ IF(GIT_FOUND AND EXISTS "${OpenAL_SOURCE_DIR}/.git") ADD_CUSTOM_TARGET(build_version ${CMAKE_COMMAND} -D GIT_EXECUTABLE=${GIT_EXECUTABLE} -D LIB_VERSION=${LIB_VERSION} + -D LIB_VERSION_NUM=${LIB_VERSION_NUM} -D SRC=${OpenAL_SOURCE_DIR}/version.h.in -D DST=${OpenAL_BINARY_DIR}/version.h -P ${OpenAL_SOURCE_DIR}/version.cmake @@ -1283,8 +1285,10 @@ ELSE() ENDIF() ENDIF() + SET(RC_CONFIG resources/openal32.rc) IF(WIN32 AND ALSOFT_BUILD_ROUTER) ADD_LIBRARY(OpenAL SHARED + resources/router.rc router/router.cpp router/router.h router/alc.cpp @@ -1312,9 +1316,10 @@ ELSE() SET(LIBNAME "soft_oal") SET(IMPL_TARGET soft_oal) + SET(RC_CONFIG resources/soft_oal.rc) ENDIF() - ADD_LIBRARY(${IMPL_TARGET} SHARED ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS}) + ADD_LIBRARY(${IMPL_TARGET} SHARED ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS} ${RC_CONFIG}) IF(WIN32) SET_TARGET_PROPERTIES(${IMPL_TARGET} PROPERTIES PREFIX "") ENDIF() diff --git a/resources/openal32.rc b/resources/openal32.rc new file mode 100644 index 0000000000000000000000000000000000000000..28475185640a24d4dd98e4c03fd96c7b6bcdf779 GIT binary patch literal 4134 zcmds)Sx-|z6vxl2CVq!&d6B5>FC@kU=pxcBbU_mmQkE8yQcPP!5Sms#hoc{|}f;Y(;2_6?dPdu1=-vh3ysRy*vrp+0rAAMD1hoq}+~$t63tk5gz< z_jrjqHI@219J*j$fZcJ(o>tP#=Loh+EQ7=?>?ALoW79WQW98z`>J{F+4|=vZ!3#ZS z72(O|O(#9T!?ggZ%kmb@q8fKlen!U{TDW#LIgrRz<%4MiLHL@kvczAjgf1F;i z)}}h2J#c!(evn~#M==_kF~1Tzh?C|cd?33XxC~CScEIX785y6c+E=QdYHNMq3172g zDqma2Y1hE7!Do+0_(g|3xo)U3m++r#okEhnyV-R&Wy!KO+V7HaO>WpYM<=6&431G( zYy&H8@@&}gT}2ACVU7`Bm`2@2W6jwig_KuzN!QUpqFc0T@O6e-em#D67M(pjFgJM$j!7q6bS`J+v`i2eE9k%Fe`rvr)1~8-J^P#gu8H)vHB!wN(1iloHP!;*4JpfJcs6GcwJ$!YkJ=P zgSJ&4t@qe`Of7oEh`S$qqc<)eW^bh|r|DL4lAB`yYCIA2c literal 0 HcmV?d00001 diff --git a/resources/resource.h b/resources/resource.h new file mode 100644 index 00000000..287c9113 --- /dev/null +++ b/resources/resource.h @@ -0,0 +1,15 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by openal32.rc, router.rc, soft_oal.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/resources/router.rc b/resources/router.rc new file mode 100644 index 0000000000000000000000000000000000000000..71205f8fc1aff55907e2a7b8f981139942c6f6e3 GIT binary patch literal 4108 zcmds)Sx-|z6vxl2CVq!&d6B5>FC@kU=whW%LKie4Y0A>lq!iOdB=NJWzyC~!c1la2 z@_=S?JNM3<`JesF>F;05wrq**S<6nXYgg9eX;`1NDr-F(Sl!xu?busJVof`@4o{c$ zKJyuCU1psd@OH|3!k5rm_6?dPdu1=-vh3ysRy*vrp+0l8AMDz#oq=%8$tAn6k27df zcX)|9HIw=~9J*k(!0tF?Pb+Dj=Loh+EQ7>N>?AK-VAD5NVWo9z^%8I12R&Py;)R~G zituFf1{ANI#T$IdgJ&RaS=PQ-%?{yKvLYM~@pOijv=tb_{mDpXo-BiLXgN+~Y@hRs zj%$I{eO4>XId&4T{EDZ`@tud`Cws?U3A*i>6g75B6S^pJq|ufguvdm64PFr`^6;(l zwhPy^JM}#MEUAL8!D7CTr(dSxOy(XOKTbjrlhZgVE*FhrdU$MoDewv}Q2 z$ba5qI<+<@k6C!@bK`aGn0WPhJJMwqp9LbLL$vyc_w=&$!(v66>-m>rrW)0_AbrrJ zN`BPHhzwa;ayha;%#tiwqAEYWqwLYTPA9zOiNVYSjVxIJtH^$N3bv}i-Voscu0^7% zLRBgM1x}D8>#9T!?t4g4BFm+LG|W0_HG7%wQc5RZ2}AWzmCI0hDr8Hn@#yq8{v^F( ztxa`4zvuLd{UE~%j$%AEV}3<+5GTzwd?33XxeQLTcEsvB85y4`+gGZeYHM}q3172g zDqmYCY1hE7z-O07`1=lfdfiZEF5*AgI)x;CceCqm%93Smw9k`q4Q|*tN2jBO431G( zYy&H8@@&}2ZAA*SVU7`Bm`2q_W5wAag_KuzN!L+Fq8qfT^L36~x@A%m@&(i|$4Ei9 zH0Q^=8Q)0+#6$QE+>P9YgYN1RtW)Q?nTuPT%bv@9+2(y6G>GR|ANffAT9;WJ-K1@b zSWT5v+!Sj|)X+8~_G!#Pkth0K{Q?M0hb}*S!v^XBn{+RIaJ&z4aIRph0y%fUZ({Fx zV!adii~2LRRi~10<83llA0yRk!h(3Gb=e4{>gJhN0aeML|ltP&3^jPYn6 zNjrMe{&)Ms|cv{wHt~ z>wV@XYh7lYyXNhL_k=H@UD!8hmh6?igv+v<7g+7E+lIR7Xg}DETWf-F!^tH(w~te3 zQ}=j@IyII0I~=-TUVzpKuvU8fV?3dCS`j7F9$f>ma}Issc%pfo_(gKL?n zs!>&{e}NMu$+;?#hkFSrDrC7dkcK%Yt!6LteM;%%D`BV}s&ZK>PmOGeH6ETG#UH0v zthK4mrw^P?+Yd6V=qN^GGv-%D2XWHezz4GHfy>|wYX_{Zk&*G4s(q#UskYV!p71q0 zrt-CQoOTub8hmzmgum;sC)W*C<}&`1ty4(ScQ?E4rW{$;M*9L8*W!kab96FV$lw?? zZR=QRgJ<22?Vtrj}M2Da7y64kZMh`k+iP)tg?;Flu!XYRB-^bH%RJ3OPW>4W3FlZSH+ zOBTt-J$@5=&lBsNkOiXtO!ufBCgCpJV5~ezn(~0VJSUBUuk|$=FVCU*9=xuw*fl+G z|DJ8j*h0}FTd5E7z4ucr8{@~;nk`C(eL(Q({gpU->)5S(XT@2nK^!er(3HVFe4`F` zH0M-LeXUR&tPl@r#%Qz;r5(O$f3*4r&3tF@Je~G@_YAT?c>FD>F6sa5qVq1N;{T{E rmxq_cOrNTw$}z2jR;N1tk2d}f8|*mW9-kiX9qNq!;XmfzlXU$9mtFYG literal 0 HcmV?d00001 diff --git a/version.h.in b/version.h.in index 56f738a3..9bb439d8 100644 --- a/version.h.in +++ b/version.h.in @@ -1,5 +1,6 @@ /* Define to the library version */ #define ALSOFT_VERSION "${LIB_VERSION}" +#define ALSOFT_VERSION_NUM ${LIB_VERSION_NUM} /* Define the branch being built */ #define ALSOFT_GIT_BRANCH "${GIT_BRANCH}"